]> git.saurik.com Git - apple/security.git/blobdiff - OSX/sec/sec.xcodeproj/project.pbxproj
projects / apple / security.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Security-57740.1.18.tar.gz
[apple/security.git] / OSX / sec / sec.xcodeproj / project.pbxproj
diff --git a/OSX/sec/sec.xcodeproj/project.pbxproj b/OSX/sec/sec.xcodeproj/project.pbxproj
index 44102c59263376eb6f861fbc4a235efcb889879f..98166cd823d8cd3ca249adf7119a9bdfefcf3253 100644 (file)
--- a/OSX/sec/sec.xcodeproj/project.pbxproj
+++ b/OSX/sec/sec.xcodeproj/project.pbxproj
@@ -7,11 +7,21 @@
        objects = {
 
 /* Begin PBXBuildFile section */
        objects = {
 
 /* Begin PBXBuildFile section */
+               093F67A41CC1171B0033151D /* SecKeyAdaptors.c in Sources */ = {isa = PBXBuildFile; fileRef = 093F67A21CC1171B0033151D /* SecKeyAdaptors.c */; };
+               093F67A51CC1171B0033151D /* SecKeyAdaptors.c in Sources */ = {isa = PBXBuildFile; fileRef = 093F67A21CC1171B0033151D /* SecKeyAdaptors.c */; };
+               093F67A61CC1171B0033151D /* SecKeyAdaptors.c in Sources */ = {isa = PBXBuildFile; fileRef = 093F67A21CC1171B0033151D /* SecKeyAdaptors.c */; };
+               0982E02C1D19695B0060002E /* si-44-seckey-ec.m in Sources */ = {isa = PBXBuildFile; fileRef = 0982E02B1D19695B0060002E /* si-44-seckey-ec.m */; };
+               09AE116F1CEDA1E4004C617D /* si-44-seckey-ies.m in Sources */ = {isa = PBXBuildFile; fileRef = 09AE116D1CEDA17A004C617D /* si-44-seckey-ies.m */; };
+               09D1FC1F1CDCBABF00A82D0D /* si-44-seckey-gen.m in Sources */ = {isa = PBXBuildFile; fileRef = 09D1FC1D1CDCBA8800A82D0D /* si-44-seckey-gen.m */; };
+               09EC947F1CEDEA70003E5101 /* si-44-seckey-rsa.m in Sources */ = {isa = PBXBuildFile; fileRef = 09EC947E1CEDEA70003E5101 /* si-44-seckey-rsa.m */; };
                0C062B1F175E784B00806CFE /* secd-30-keychain-upgrade.c in Sources */ = {isa = PBXBuildFile; fileRef = 0C062B1C175E784B00806CFE /* secd-30-keychain-upgrade.c */; };
                0C062B20175E784B00806CFE /* secd-31-keychain-bad.c in Sources */ = {isa = PBXBuildFile; fileRef = 0C062B1D175E784B00806CFE /* secd-31-keychain-bad.c */; };
                0C062B21175E784B00806CFE /* secd-31-keychain-unreadable.c in Sources */ = {isa = PBXBuildFile; fileRef = 0C062B1E175E784B00806CFE /* secd-31-keychain-unreadable.c */; };
                0C0BDB611756882A00BC1A7E /* secd_regressions.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C0BDB601756882A00BC1A7E /* secd_regressions.h */; };
                0C0BDB63175688DA00BC1A7E /* secd-01-items.c in Sources */ = {isa = PBXBuildFile; fileRef = 0C0BDB62175688DA00BC1A7E /* secd-01-items.c */; };
                0C062B1F175E784B00806CFE /* secd-30-keychain-upgrade.c in Sources */ = {isa = PBXBuildFile; fileRef = 0C062B1C175E784B00806CFE /* secd-30-keychain-upgrade.c */; };
                0C062B20175E784B00806CFE /* secd-31-keychain-bad.c in Sources */ = {isa = PBXBuildFile; fileRef = 0C062B1D175E784B00806CFE /* secd-31-keychain-bad.c */; };
                0C062B21175E784B00806CFE /* secd-31-keychain-unreadable.c in Sources */ = {isa = PBXBuildFile; fileRef = 0C062B1E175E784B00806CFE /* secd-31-keychain-unreadable.c */; };
                0C0BDB611756882A00BC1A7E /* secd_regressions.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C0BDB601756882A00BC1A7E /* secd_regressions.h */; };
                0C0BDB63175688DA00BC1A7E /* secd-01-items.c in Sources */ = {isa = PBXBuildFile; fileRef = 0C0BDB62175688DA00BC1A7E /* secd-01-items.c */; };
+               0C0C887A1CCED00E00617D1B /* shared_regressions.h in Headers */ = {isa = PBXBuildFile; fileRef = D40771B21C9B4CE50016AA66 /* shared_regressions.h */; };
+               0C3276C31CB329AB005D6DDC /* secd_77_ids_messaging.c in Sources */ = {isa = PBXBuildFile; fileRef = 0C3276C21CB329AB005D6DDC /* secd_77_ids_messaging.c */; };
+               0C60F39C1CAF0E8E00221D24 /* secd-76-idstransport.c in Sources */ = {isa = PBXBuildFile; fileRef = 0C60F39B1CAF0E8E00221D24 /* secd-76-idstransport.c */; };
                0C664AE8175951270092D3D9 /* secd-02-upgrade-while-locked.c in Sources */ = {isa = PBXBuildFile; fileRef = 0C664AE7175951270092D3D9 /* secd-02-upgrade-while-locked.c */; };
                0CBF93F8177B7CFC001E5658 /* secd-03-corrupted-items.c in Sources */ = {isa = PBXBuildFile; fileRef = 0CBF93F5177B7CFC001E5658 /* secd-03-corrupted-items.c */; };
                0CBF93F9177B7CFC001E5658 /* secd-04-corrupted-items.c in Sources */ = {isa = PBXBuildFile; fileRef = 0CBF93F6177B7CFC001E5658 /* secd-04-corrupted-items.c */; };
                0C664AE8175951270092D3D9 /* secd-02-upgrade-while-locked.c in Sources */ = {isa = PBXBuildFile; fileRef = 0C664AE7175951270092D3D9 /* secd-02-upgrade-while-locked.c */; };
                0CBF93F8177B7CFC001E5658 /* secd-03-corrupted-items.c in Sources */ = {isa = PBXBuildFile; fileRef = 0CBF93F5177B7CFC001E5658 /* secd-03-corrupted-items.c */; };
                0CBF93F9177B7CFC001E5658 /* secd-04-corrupted-items.c in Sources */ = {isa = PBXBuildFile; fileRef = 0CBF93F6177B7CFC001E5658 /* secd-04-corrupted-items.c */; };
@@ -59,61 +69,69 @@
                32FBBBE71B556F8900AEF9ED /* verify_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = 32FBBBE61B556F8900AEF9ED /* verify_cert.c */; };
                32FBBBE81B55B30E00AEF9ED /* verify_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = 32FBBBE61B556F8900AEF9ED /* verify_cert.c */; };
                3A70988218CDF648009FD2CC /* si_77_SecAccessControl.c in Sources */ = {isa = PBXBuildFile; fileRef = 3A70988118CDF648009FD2CC /* si_77_SecAccessControl.c */; };
                32FBBBE71B556F8900AEF9ED /* verify_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = 32FBBBE61B556F8900AEF9ED /* verify_cert.c */; };
                32FBBBE81B55B30E00AEF9ED /* verify_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = 32FBBBE61B556F8900AEF9ED /* verify_cert.c */; };
                3A70988218CDF648009FD2CC /* si_77_SecAccessControl.c in Sources */ = {isa = PBXBuildFile; fileRef = 3A70988118CDF648009FD2CC /* si_77_SecAccessControl.c */; };
-               43C3B1681AFD588800786702 /* IDS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD6C9BF81A813D52002AB913 /* IDS.framework */; };
                43C3B1691AFD58AB00786702 /* IDS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD6C9BF81A813D52002AB913 /* IDS.framework */; };
                43C3B16A1AFD58AC00786702 /* IDS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD6C9BF81A813D52002AB913 /* IDS.framework */; };
                43C3B16B1AFD58BE00786702 /* IDS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD6C9BF81A813D52002AB913 /* IDS.framework */; };
                4406660F19069C67000DA171 /* si-80-empty-data.c in Sources */ = {isa = PBXBuildFile; fileRef = 4406660E19069707000DA171 /* si-80-empty-data.c */; };
                43C3B1691AFD58AB00786702 /* IDS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD6C9BF81A813D52002AB913 /* IDS.framework */; };
                43C3B16A1AFD58AC00786702 /* IDS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD6C9BF81A813D52002AB913 /* IDS.framework */; };
                43C3B16B1AFD58BE00786702 /* IDS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD6C9BF81A813D52002AB913 /* IDS.framework */; };
                4406660F19069C67000DA171 /* si-80-empty-data.c in Sources */ = {isa = PBXBuildFile; fileRef = 4406660E19069707000DA171 /* si-80-empty-data.c */; };
+               440BF8F81A7A82AE001760A7 /* si-82-token-ag.c in Sources */ = {isa = PBXBuildFile; fileRef = 440BF8F41A7A7EC9001760A7 /* si-82-token-ag.c */; };
+               442B69201BC3B149000F3A72 /* SecKey.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD563C14CB6EB9008233F2 /* SecKey.c */; };
+               442B69211BC3B196000F3A72 /* SecECKey.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD562C14CB6EB9008233F2 /* SecECKey.c */; };
+               442B69221BC3B1B9000F3A72 /* SecRSAKey.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD564714CB6EB9008233F2 /* SecRSAKey.c */; };
+               442B69251BC3DBA9000F3A72 /* SecCTKKey.c in Sources */ = {isa = PBXBuildFile; fileRef = 449265271AB0D6FF00644D4C /* SecCTKKey.c */; };
                4469FC2C1AA0A6C90021AA26 /* secd-32-restore-bad-backup.c in Sources */ = {isa = PBXBuildFile; fileRef = 446CEEE319B6043900ECAF50 /* secd-32-restore-bad-backup.c */; };
                4469FC2C1AA0A6C90021AA26 /* secd-32-restore-bad-backup.c in Sources */ = {isa = PBXBuildFile; fileRef = 446CEEE319B6043900ECAF50 /* secd-32-restore-bad-backup.c */; };
-               4469FC2D1AA0A6D00021AA26 /* secd-33-keychain-ctk.c in Sources */ = {isa = PBXBuildFile; fileRef = 4469FC2A1AA0A69E0021AA26 /* secd-33-keychain-ctk.c */; };
+               4469FC2D1AA0A6D00021AA26 /* secd-33-keychain-ctk.m in Sources */ = {isa = PBXBuildFile; fileRef = 4469FC2A1AA0A69E0021AA26 /* secd-33-keychain-ctk.m */; };
                446BB5E518F83172005D1B83 /* SecAccessControl.c in Sources */ = {isa = PBXBuildFile; fileRef = C6766767189884D200E9A12C /* SecAccessControl.c */; };
                4477A8D918F28AB700B5BB9F /* si-78-query-attrs.c in Sources */ = {isa = PBXBuildFile; fileRef = 4477A8D718F28AAE00B5BB9F /* si-78-query-attrs.c */; };
                448305101B46FB8700326450 /* ios8-inet-keychain-2.h in Headers */ = {isa = PBXBuildFile; fileRef = 4483050F1B46FB8700326450 /* ios8-inet-keychain-2.h */; };
                448305111B46FC0D00326450 /* secd-35-keychain-migrate-inet.c in Sources */ = {isa = PBXBuildFile; fileRef = 4483050D1B46FB6C00326450 /* secd-35-keychain-migrate-inet.c */; };
                449265291AB0D6FF00644D4C /* SecCTKKey.c in Sources */ = {isa = PBXBuildFile; fileRef = 449265271AB0D6FF00644D4C /* SecCTKKey.c */; };
                4492652A1AB0D6FF00644D4C /* SecCTKKeyPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 449265281AB0D6FF00644D4C /* SecCTKKeyPriv.h */; };
                446BB5E518F83172005D1B83 /* SecAccessControl.c in Sources */ = {isa = PBXBuildFile; fileRef = C6766767189884D200E9A12C /* SecAccessControl.c */; };
                4477A8D918F28AB700B5BB9F /* si-78-query-attrs.c in Sources */ = {isa = PBXBuildFile; fileRef = 4477A8D718F28AAE00B5BB9F /* si-78-query-attrs.c */; };
                448305101B46FB8700326450 /* ios8-inet-keychain-2.h in Headers */ = {isa = PBXBuildFile; fileRef = 4483050F1B46FB8700326450 /* ios8-inet-keychain-2.h */; };
                448305111B46FC0D00326450 /* secd-35-keychain-migrate-inet.c in Sources */ = {isa = PBXBuildFile; fileRef = 4483050D1B46FB6C00326450 /* secd-35-keychain-migrate-inet.c */; };
                449265291AB0D6FF00644D4C /* SecCTKKey.c in Sources */ = {isa = PBXBuildFile; fileRef = 449265271AB0D6FF00644D4C /* SecCTKKey.c */; };
                4492652A1AB0D6FF00644D4C /* SecCTKKeyPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 449265281AB0D6FF00644D4C /* SecCTKKeyPriv.h */; };
-               4802A59616D711060059E5B9 /* SOSUserKeygen.c in Sources */ = {isa = PBXBuildFile; fileRef = 4802A59516D711060059E5B9 /* SOSUserKeygen.c */; };
                4802A59816D7156D0059E5B9 /* SOSUserKeygen.h in Headers */ = {isa = PBXBuildFile; fileRef = 4802A59716D711190059E5B9 /* SOSUserKeygen.h */; settings = {ATTRIBUTES = (); }; };
                4802A59816D7156D0059E5B9 /* SOSUserKeygen.h in Headers */ = {isa = PBXBuildFile; fileRef = 4802A59716D711190059E5B9 /* SOSUserKeygen.h */; settings = {ATTRIBUTES = (); }; };
+               48122CCA1CFF88FF009BE3E3 /* SOSAccountLog.h in Headers */ = {isa = PBXBuildFile; fileRef = 48122CC81CFF88DC009BE3E3 /* SOSAccountLog.h */; };
+               481A95511D1A02AA000B98F5 /* SOSCloudKeychainLogging.c in Sources */ = {isa = PBXBuildFile; fileRef = 481A954F1D1A02AA000B98F5 /* SOSCloudKeychainLogging.c */; };
+               481A95521D1A02AA000B98F5 /* SOSCloudKeychainLogging.h in Headers */ = {isa = PBXBuildFile; fileRef = 481A95501D1A02AA000B98F5 /* SOSCloudKeychainLogging.h */; };
+               4826374D1CC18A410082C9C8 /* secd-57-1-account-last-standing.c in Sources */ = {isa = PBXBuildFile; fileRef = 4826374C1CC18A410082C9C8 /* secd-57-1-account-last-standing.c */; };
                48279BC51C57FEA20043457C /* keychain_log.c in Sources */ = {isa = PBXBuildFile; fileRef = 48279BC31C57FEA20043457C /* keychain_log.c */; };
                48279BC51C57FEA20043457C /* keychain_log.c in Sources */ = {isa = PBXBuildFile; fileRef = 48279BC31C57FEA20043457C /* keychain_log.c */; };
+               4838F6BE1CB5AA7C009E8598 /* secViewDisplay.c in Sources */ = {isa = PBXBuildFile; fileRef = 4838F6BB1CB5AA5F009E8598 /* secViewDisplay.c */; };
+               4838F6BF1CB5AA7E009E8598 /* secViewDisplay.c in Sources */ = {isa = PBXBuildFile; fileRef = 4838F6BB1CB5AA5F009E8598 /* secViewDisplay.c */; };
+               4838F6C01CB5B055009E8598 /* secViewDisplay.c in Sources */ = {isa = PBXBuildFile; fileRef = 4838F6BB1CB5AA5F009E8598 /* secViewDisplay.c */; };
+               4838F6C11CB5B061009E8598 /* secToolFileIO.c in Sources */ = {isa = PBXBuildFile; fileRef = 4899F2E71C768BBE00762615 /* secToolFileIO.c */; };
                484182611A30F2F200211511 /* SOSCirclePriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 484182601A30F2E300211511 /* SOSCirclePriv.h */; };
                484182641A30F8DE00211511 /* SOSPeerInfoPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 484182631A30F8D300211511 /* SOSPeerInfoPriv.h */; };
                485B5E621AE068D800A3C183 /* secd-82-secproperties-basic.c in Sources */ = {isa = PBXBuildFile; fileRef = 485B5E611AE068D800A3C183 /* secd-82-secproperties-basic.c */; };
                484182611A30F2F200211511 /* SOSCirclePriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 484182601A30F2E300211511 /* SOSCirclePriv.h */; };
                484182641A30F8DE00211511 /* SOSPeerInfoPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 484182631A30F8D300211511 /* SOSPeerInfoPriv.h */; };
                485B5E621AE068D800A3C183 /* secd-82-secproperties-basic.c in Sources */ = {isa = PBXBuildFile; fileRef = 485B5E611AE068D800A3C183 /* secd-82-secproperties-basic.c */; };
+               485FE6BE1CDBED9500C916C5 /* syncbackup.c in Sources */ = {isa = PBXBuildFile; fileRef = 485FE6BC1CDBED5800C916C5 /* syncbackup.c */; };
+               4868F41C1C7409EF0011825E /* SOSInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = E777C71B15B73F59004044A8 /* SOSInternal.h */; };
                486C6C691795F9D600387075 /* secd-61-account-leave-not-in-kansas-anymore.c in Sources */ = {isa = PBXBuildFile; fileRef = 486C6C671795F20E00387075 /* secd-61-account-leave-not-in-kansas-anymore.c */; };
                486C6C691795F9D600387075 /* secd-61-account-leave-not-in-kansas-anymore.c in Sources */ = {isa = PBXBuildFile; fileRef = 486C6C671795F20E00387075 /* secd-61-account-leave-not-in-kansas-anymore.c */; };
-               48764AE817FA2DD00005C4F1 /* SOSAccountDer.c in Sources */ = {isa = PBXBuildFile; fileRef = 48764AE717FA2DD00005C4F1 /* SOSAccountDer.c */; };
-               48764AEC17FA31E50005C4F1 /* SOSAccountPersistence.c in Sources */ = {isa = PBXBuildFile; fileRef = 48764AEB17FA31E50005C4F1 /* SOSAccountPersistence.c */; };
-               48764AEF17FA36200005C4F1 /* SOSAccountUpdate.c in Sources */ = {isa = PBXBuildFile; fileRef = 48764AEE17FA36200005C4F1 /* SOSAccountUpdate.c */; };
                48764AF217FA3ACF0005C4F1 /* SOSKVSKeys.c in Sources */ = {isa = PBXBuildFile; fileRef = 48764AF117FA3ACF0005C4F1 /* SOSKVSKeys.c */; };
                48764AF217FA3ACF0005C4F1 /* SOSKVSKeys.c in Sources */ = {isa = PBXBuildFile; fileRef = 48764AF117FA3ACF0005C4F1 /* SOSKVSKeys.c */; };
-               48764AF517FA3FE50005C4F1 /* SOSAccountCircles.c in Sources */ = {isa = PBXBuildFile; fileRef = 48764AF417FA3FE50005C4F1 /* SOSAccountCircles.c */; };
                4878267B19C0F518002CB56F /* sc-42-circlegencount.c in Sources */ = {isa = PBXBuildFile; fileRef = 4878267919C0F505002CB56F /* sc-42-circlegencount.c */; };
                4882C517177521AE0095D04B /* secd-58-password-change.c in Sources */ = {isa = PBXBuildFile; fileRef = 4882C516177521AE0095D04B /* secd-58-password-change.c */; };
                4885010F1AF9857F00F10B61 /* SOSTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 52F8DE4A1AF2E9AE00A2C271 /* SOSTypes.h */; };
                488902EC16C2F88400F119FF /* SOSCoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 488902EB16C2F88400F119FF /* SOSCoder.c */; };
                4898223A17BDB277003BEF32 /* secd-52-account-changed.c in Sources */ = {isa = PBXBuildFile; fileRef = 4898223917BDB277003BEF32 /* secd-52-account-changed.c */; };
                4878267B19C0F518002CB56F /* sc-42-circlegencount.c in Sources */ = {isa = PBXBuildFile; fileRef = 4878267919C0F505002CB56F /* sc-42-circlegencount.c */; };
                4882C517177521AE0095D04B /* secd-58-password-change.c in Sources */ = {isa = PBXBuildFile; fileRef = 4882C516177521AE0095D04B /* secd-58-password-change.c */; };
                4885010F1AF9857F00F10B61 /* SOSTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 52F8DE4A1AF2E9AE00A2C271 /* SOSTypes.h */; };
                488902EC16C2F88400F119FF /* SOSCoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 488902EB16C2F88400F119FF /* SOSCoder.c */; };
                4898223A17BDB277003BEF32 /* secd-52-account-changed.c in Sources */ = {isa = PBXBuildFile; fileRef = 4898223917BDB277003BEF32 /* secd-52-account-changed.c */; };
+               4899F2E91C768BBE00762615 /* secToolFileIO.c in Sources */ = {isa = PBXBuildFile; fileRef = 4899F2E71C768BBE00762615 /* secToolFileIO.c */; };
+               4899F2EA1C768BBE00762615 /* secToolFileIO.h in Headers */ = {isa = PBXBuildFile; fileRef = 4899F2E81C768BBE00762615 /* secToolFileIO.h */; };
+               4899F2EC1C7690DE00762615 /* secToolFileIO.c in Sources */ = {isa = PBXBuildFile; fileRef = 4899F2E71C768BBE00762615 /* secToolFileIO.c */; };
                489E6E4C1A71A87600D7EB8C /* SOSCircleDer.c in Sources */ = {isa = PBXBuildFile; fileRef = 489E6E4A1A71A87600D7EB8C /* SOSCircleDer.c */; };
                489E6E4D1A71A87600D7EB8C /* SOSCircleDer.h in Headers */ = {isa = PBXBuildFile; fileRef = 489E6E4B1A71A87600D7EB8C /* SOSCircleDer.h */; };
                48A071CF1AD6AEA900728AEF /* SOSPeerInfoSecurityProperties.c in Sources */ = {isa = PBXBuildFile; fileRef = 48A071CD1AD6AEA900728AEF /* SOSPeerInfoSecurityProperties.c */; };
                48A071D01AD6AEA900728AEF /* SOSPeerInfoSecurityProperties.h in Headers */ = {isa = PBXBuildFile; fileRef = 48A071CE1AD6AEA900728AEF /* SOSPeerInfoSecurityProperties.h */; };
                48A0FEDE1B6046E2001D6180 /* secd-64-circlereset.c in Sources */ = {isa = PBXBuildFile; fileRef = 48A0FEDD1B6046E2001D6180 /* secd-64-circlereset.c */; };
                489E6E4C1A71A87600D7EB8C /* SOSCircleDer.c in Sources */ = {isa = PBXBuildFile; fileRef = 489E6E4A1A71A87600D7EB8C /* SOSCircleDer.c */; };
                489E6E4D1A71A87600D7EB8C /* SOSCircleDer.h in Headers */ = {isa = PBXBuildFile; fileRef = 489E6E4B1A71A87600D7EB8C /* SOSCircleDer.h */; };
                48A071CF1AD6AEA900728AEF /* SOSPeerInfoSecurityProperties.c in Sources */ = {isa = PBXBuildFile; fileRef = 48A071CD1AD6AEA900728AEF /* SOSPeerInfoSecurityProperties.c */; };
                48A071D01AD6AEA900728AEF /* SOSPeerInfoSecurityProperties.h in Headers */ = {isa = PBXBuildFile; fileRef = 48A071CE1AD6AEA900728AEF /* SOSPeerInfoSecurityProperties.h */; };
                48A0FEDE1B6046E2001D6180 /* secd-64-circlereset.c in Sources */ = {isa = PBXBuildFile; fileRef = 48A0FEDD1B6046E2001D6180 /* secd-64-circlereset.c */; };
+               48A9E62F1C837B4100160B5F /* secd-90-hsa2.c in Sources */ = {isa = PBXBuildFile; fileRef = 48FABEE01AD05C7100C061D1 /* secd-90-hsa2.c */; };
                48B0B36F1B27B01F003E1EDB /* sc-25-soskeygen.c in Sources */ = {isa = PBXBuildFile; fileRef = 48487D271B1D5E960078C7C9 /* sc-25-soskeygen.c */; };
                48B0B36F1B27B01F003E1EDB /* sc-25-soskeygen.c in Sources */ = {isa = PBXBuildFile; fileRef = 48487D271B1D5E960078C7C9 /* sc-25-soskeygen.c */; };
+               48B5888C1D00ED9000E0C5A7 /* secd-200-logstate.c in Sources */ = {isa = PBXBuildFile; fileRef = 48B5888B1D00ED9000E0C5A7 /* secd-200-logstate.c */; };
                48C34E921C45EF3000B7F29B /* secd60-account-cloud-exposure.c in Sources */ = {isa = PBXBuildFile; fileRef = 48C34E911C45EF3000B7F29B /* secd60-account-cloud-exposure.c */; };
                48C34E921C45EF3000B7F29B /* secd60-account-cloud-exposure.c in Sources */ = {isa = PBXBuildFile; fileRef = 48C34E911C45EF3000B7F29B /* secd60-account-cloud-exposure.c */; };
-               48C7DF9317FF2DB500904F1A /* SOSAccountCredentials.c in Sources */ = {isa = PBXBuildFile; fileRef = 48C7DF9217FF2DB500904F1A /* SOSAccountCredentials.c */; };
-               48C7DF9617FF351A00904F1A /* SOSAccountPeers.c in Sources */ = {isa = PBXBuildFile; fileRef = 48C7DF9517FF351A00904F1A /* SOSAccountPeers.c */; };
-               48C7DF9817FF360F00904F1A /* SOSAccountFullPeerInfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 48C7DF9717FF360F00904F1A /* SOSAccountFullPeerInfo.c */; };
-               48C7DF9A17FF44EF00904F1A /* SOSAccountCloudParameters.c in Sources */ = {isa = PBXBuildFile; fileRef = 48C7DF9917FF44EF00904F1A /* SOSAccountCloudParameters.c */; };
                48CE733E1731C49A004C2946 /* sc-130-resignationticket.c in Sources */ = {isa = PBXBuildFile; fileRef = 48CE733D1731C49A004C2946 /* sc-130-resignationticket.c */; };
                48E928C5179DD05500A7F755 /* secd-51-account-inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 48E928C4179DD05500A7F755 /* secd-51-account-inflate.c */; };
                48E9CDFC1C597FED00574D6B /* SOSSysdiagnose.c in Sources */ = {isa = PBXBuildFile; fileRef = 48E9CDFB1C597FED00574D6B /* SOSSysdiagnose.c */; };
                48F32D7E1777AFA3001B84BA /* secd-59-account-cleanup.c in Sources */ = {isa = PBXBuildFile; fileRef = 48F32D7D1777AFA3001B84BA /* secd-59-account-cleanup.c */; };
                48F7DF261A6DB32900046644 /* SOSViews.c in Sources */ = {isa = PBXBuildFile; fileRef = 48F7DF241A6DB32900046644 /* SOSViews.c */; };
                48F7DF271A6DB32900046644 /* SOSViews.h in Headers */ = {isa = PBXBuildFile; fileRef = 48F7DF251A6DB32900046644 /* SOSViews.h */; };
                48CE733E1731C49A004C2946 /* sc-130-resignationticket.c in Sources */ = {isa = PBXBuildFile; fileRef = 48CE733D1731C49A004C2946 /* sc-130-resignationticket.c */; };
                48E928C5179DD05500A7F755 /* secd-51-account-inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 48E928C4179DD05500A7F755 /* secd-51-account-inflate.c */; };
                48E9CDFC1C597FED00574D6B /* SOSSysdiagnose.c in Sources */ = {isa = PBXBuildFile; fileRef = 48E9CDFB1C597FED00574D6B /* SOSSysdiagnose.c */; };
                48F32D7E1777AFA3001B84BA /* secd-59-account-cleanup.c in Sources */ = {isa = PBXBuildFile; fileRef = 48F32D7D1777AFA3001B84BA /* secd-59-account-cleanup.c */; };
                48F7DF261A6DB32900046644 /* SOSViews.c in Sources */ = {isa = PBXBuildFile; fileRef = 48F7DF241A6DB32900046644 /* SOSViews.c */; };
                48F7DF271A6DB32900046644 /* SOSViews.h in Headers */ = {isa = PBXBuildFile; fileRef = 48F7DF251A6DB32900046644 /* SOSViews.h */; };
-               48FABEDD1AD05C1D00C061D1 /* SOSAccountHSAJoin.c in Sources */ = {isa = PBXBuildFile; fileRef = 48FABEDB1AD05C1D00C061D1 /* SOSAccountHSAJoin.c */; };
                48FABEDE1AD05C1D00C061D1 /* SOSAccountHSAJoin.h in Headers */ = {isa = PBXBuildFile; fileRef = 48FABEDC1AD05C1D00C061D1 /* SOSAccountHSAJoin.h */; };
                48FABEDE1AD05C1D00C061D1 /* SOSAccountHSAJoin.h in Headers */ = {isa = PBXBuildFile; fileRef = 48FABEDC1AD05C1D00C061D1 /* SOSAccountHSAJoin.h */; };
-               48FABEE21AD05C7100C061D1 /* secd-90-hsa2.c in Sources */ = {isa = PBXBuildFile; fileRef = 48FABEE01AD05C7100C061D1 /* secd-90-hsa2.c */; };
                48FABEE31AD06B6B00C061D1 /* secd-62-account-hsa-join.c in Sources */ = {isa = PBXBuildFile; fileRef = 48FABEDF1AD05C7100C061D1 /* secd-62-account-hsa-join.c */; };
                48FB17021A76F56C00B586C7 /* SOSPeerInfoV2.c in Sources */ = {isa = PBXBuildFile; fileRef = 48FB17001A76F56C00B586C7 /* SOSPeerInfoV2.c */; };
                48FB17031A76F56C00B586C7 /* SOSPeerInfoV2.h in Headers */ = {isa = PBXBuildFile; fileRef = 48FB17011A76F56C00B586C7 /* SOSPeerInfoV2.h */; };
                48FB17061A771E5700B586C7 /* secd-80-views-basic.c in Sources */ = {isa = PBXBuildFile; fileRef = 48FB17041A77181A00B586C7 /* secd-80-views-basic.c */; };
                48FABEE31AD06B6B00C061D1 /* secd-62-account-hsa-join.c in Sources */ = {isa = PBXBuildFile; fileRef = 48FABEDF1AD05C7100C061D1 /* secd-62-account-hsa-join.c */; };
                48FB17021A76F56C00B586C7 /* SOSPeerInfoV2.c in Sources */ = {isa = PBXBuildFile; fileRef = 48FB17001A76F56C00B586C7 /* SOSPeerInfoV2.c */; };
                48FB17031A76F56C00B586C7 /* SOSPeerInfoV2.h in Headers */ = {isa = PBXBuildFile; fileRef = 48FB17011A76F56C00B586C7 /* SOSPeerInfoV2.h */; };
                48FB17061A771E5700B586C7 /* secd-80-views-basic.c in Sources */ = {isa = PBXBuildFile; fileRef = 48FB17041A77181A00B586C7 /* secd-80-views-basic.c */; };
-               48FEA77C1C53000A0020C148 /* secToolFileIO.c in Sources */ = {isa = PBXBuildFile; fileRef = 48FEA7771C52FFE70020C148 /* secToolFileIO.c */; };
+               48FD04F41CEFCFB900BEBBFF /* SOSAccountTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 48FD04F21CEFCFB900BEBBFF /* SOSAccountTransaction.h */; };
                4A5CCA5415ACEFD400702357 /* SecOTRDHKey.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A971683158FDEB800D439B7 /* SecOTRDHKey.c */; };
                4A5CCA5515ACEFD400702357 /* SecOTRFullIdentity.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A971686158FDEB800D439B7 /* SecOTRFullIdentity.c */; };
                4A5CCA5615ACEFD400702357 /* SecOTRMath.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A971688158FDEB800D439B7 /* SecOTRMath.c */; };
                4A5CCA5415ACEFD400702357 /* SecOTRDHKey.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A971683158FDEB800D439B7 /* SecOTRDHKey.c */; };
                4A5CCA5515ACEFD400702357 /* SecOTRFullIdentity.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A971686158FDEB800D439B7 /* SecOTRFullIdentity.c */; };
                4A5CCA5615ACEFD400702357 /* SecOTRMath.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A971688158FDEB800D439B7 /* SecOTRMath.c */; };
@@ -166,7 +184,6 @@
                4C64F59717C6B3B1009C5AC2 /* sc-45-digestvector.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C64F59617C6B3B1009C5AC2 /* sc-45-digestvector.c */; };
                4C65154B17B5A08900691B6A /* SOSDigestVector.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C8BDDA017B4FE8100C20EA5 /* SOSDigestVector.c */; };
                4C6ED19615CB0E72004379B7 /* sc-30-peerinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = E777C72815B9C9F0004044A8 /* sc-30-peerinfo.c */; };
                4C64F59717C6B3B1009C5AC2 /* sc-45-digestvector.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C64F59617C6B3B1009C5AC2 /* sc-45-digestvector.c */; };
                4C65154B17B5A08900691B6A /* SOSDigestVector.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C8BDDA017B4FE8100C20EA5 /* SOSDigestVector.c */; };
                4C6ED19615CB0E72004379B7 /* sc-30-peerinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = E777C72815B9C9F0004044A8 /* sc-30-peerinfo.c */; };
-               4C8940DB166EA8CF00241770 /* osxshim.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C8940DA166EA8CF00241770 /* osxshim.c */; };
                4C8BDD9B17B4FB8F00C20EA5 /* SOSDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C8BDD9A17B4FB8F00C20EA5 /* SOSDataSource.h */; };
                4C8BDD9D17B4FD2A00C20EA5 /* SOSManifest.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C8BDD9C17B4FD2A00C20EA5 /* SOSManifest.h */; };
                4C8BDD9F17B4FDE100C20EA5 /* SOSManifest.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C8BDD9E17B4FDE100C20EA5 /* SOSManifest.c */; };
                4C8BDD9B17B4FB8F00C20EA5 /* SOSDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C8BDD9A17B4FB8F00C20EA5 /* SOSDataSource.h */; };
                4C8BDD9D17B4FD2A00C20EA5 /* SOSManifest.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C8BDD9C17B4FD2A00C20EA5 /* SOSManifest.h */; };
                4C8BDD9F17B4FDE100C20EA5 /* SOSManifest.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C8BDD9E17B4FDE100C20EA5 /* SOSManifest.c */; };
@@ -195,26 +212,6 @@
                4CC92A6715A3ABD400C6D578 /* si-10-find-internet.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A1915A3ABD400C6D578 /* si-10-find-internet.c */; };
                4CC92A6815A3ABD400C6D578 /* si-11-update-data.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A1A15A3ABD400C6D578 /* si-11-update-data.c */; };
                4CC92A6915A3ABD400C6D578 /* si-14-dateparse.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A1B15A3ABD400C6D578 /* si-14-dateparse.c */; };
                4CC92A6715A3ABD400C6D578 /* si-10-find-internet.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A1915A3ABD400C6D578 /* si-10-find-internet.c */; };
                4CC92A6815A3ABD400C6D578 /* si-11-update-data.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A1A15A3ABD400C6D578 /* si-11-update-data.c */; };
                4CC92A6915A3ABD400C6D578 /* si-14-dateparse.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A1B15A3ABD400C6D578 /* si-14-dateparse.c */; };
-               4CC92A6A15A3ABD400C6D578 /* si-15-certificate.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A1C15A3ABD400C6D578 /* si-15-certificate.c */; };
-               4CC92A6B15A3ABD400C6D578 /* si-16-ec-certificate.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A1D15A3ABD400C6D578 /* si-16-ec-certificate.c */; };
-               4CC92A6C15A3ABD400C6D578 /* si-20-sectrust-activation.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A1E15A3ABD400C6D578 /* si-20-sectrust-activation.c */; };
-               4CC92A6D15A3ABD400C6D578 /* si-20-sectrust.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A1F15A3ABD400C6D578 /* si-20-sectrust.c */; };
-               4CC92A6E15A3ABD400C6D578 /* si-21-sectrust-asr.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2015A3ABD400C6D578 /* si-21-sectrust-asr.c */; };
-               4CC92A6F15A3ABD400C6D578 /* si-22-sectrust-iap.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2115A3ABD400C6D578 /* si-22-sectrust-iap.c */; };
-               4CC92A7015A3ABD400C6D578 /* si-23-sectrust-ocsp.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2215A3ABD400C6D578 /* si-23-sectrust-ocsp.c */; };
-               4CC92A7115A3ABD400C6D578 /* si-24-sectrust-appleid.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2315A3ABD400C6D578 /* si-24-sectrust-appleid.c */; };
-               4CC92A7215A3ABD400C6D578 /* si-24-sectrust-digicert-malaysia.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2415A3ABD400C6D578 /* si-24-sectrust-digicert-malaysia.c */; };
-               4CC92A7315A3ABD400C6D578 /* si-24-sectrust-diginotar.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2515A3ABD400C6D578 /* si-24-sectrust-diginotar.c */; };
-               4CC92A7415A3ABD400C6D578 /* si-24-sectrust-itms.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2615A3ABD400C6D578 /* si-24-sectrust-itms.c */; };
-               4CC92A7515A3ABD400C6D578 /* si-24-sectrust-mobileasset.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2715A3ABD400C6D578 /* si-24-sectrust-mobileasset.c */; };
-               4CC92A7615A3ABD400C6D578 /* si-24-sectrust-nist.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2815A3ABD400C6D578 /* si-24-sectrust-nist.c */; };
-               4CC92A7715A3ABD400C6D578 /* si-24-sectrust-otatasking.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2915A3ABD400C6D578 /* si-24-sectrust-otatasking.c */; };
-               4CC92A7815A3ABD400C6D578 /* si-24-sectrust-shoebox.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2A15A3ABD400C6D578 /* si-24-sectrust-shoebox.c */; };
-               4CC92A7915A3ABD400C6D578 /* si-25-sectrust-ipsec-eap.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2B15A3ABD400C6D578 /* si-25-sectrust-ipsec-eap.c */; };
-               4CC92A7A15A3ABD400C6D578 /* si-26-applicationsigning.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2C15A3ABD400C6D578 /* si-26-applicationsigning.c */; };
-               4CC92A7B15A3ABD400C6D578 /* si-27-sectrust-exceptions.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2D15A3ABD400C6D578 /* si-27-sectrust-exceptions.c */; };
-               4CC92A7C15A3ABD400C6D578 /* si-28-sectrustsettings.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2E15A3ABD400C6D578 /* si-28-sectrustsettings.c */; };
-               4CC92A7D15A3ABD400C6D578 /* si-29-sectrust-codesigning.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2F15A3ABD400C6D578 /* si-29-sectrust-codesigning.c */; };
                4CC92A7E15A3ABD400C6D578 /* si-30-keychain-upgrade.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A3015A3ABD400C6D578 /* si-30-keychain-upgrade.c */; };
                4CC92A7F15A3ABD400C6D578 /* si-31-keychain-bad.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A3115A3ABD400C6D578 /* si-31-keychain-bad.c */; };
                4CC92A8015A3ABD400C6D578 /* si-31-keychain-unreadable.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A3215A3ABD400C6D578 /* si-31-keychain-unreadable.c */; };
                4CC92A7E15A3ABD400C6D578 /* si-30-keychain-upgrade.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A3015A3ABD400C6D578 /* si-30-keychain-upgrade.c */; };
                4CC92A7F15A3ABD400C6D578 /* si-31-keychain-bad.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A3115A3ABD400C6D578 /* si-31-keychain-bad.c */; };
                4CC92A8015A3ABD400C6D578 /* si-31-keychain-unreadable.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A3215A3ABD400C6D578 /* si-31-keychain-unreadable.c */; };
@@ -242,17 +239,6 @@
                4CC92A9715A3ABD400C6D578 /* si-65-cms-cert-policy.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A4B15A3ABD400C6D578 /* si-65-cms-cert-policy.c */; };
                4CC92A9815A3ABD400C6D578 /* signed-receipt.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CC92A4D15A3ABD400C6D578 /* signed-receipt.h */; };
                4CC92A9915A3ABD400C6D578 /* si-66-smime.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A4E15A3ABD400C6D578 /* si-66-smime.c */; };
                4CC92A9715A3ABD400C6D578 /* si-65-cms-cert-policy.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A4B15A3ABD400C6D578 /* si-65-cms-cert-policy.c */; };
                4CC92A9815A3ABD400C6D578 /* signed-receipt.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CC92A4D15A3ABD400C6D578 /* signed-receipt.h */; };
                4CC92A9915A3ABD400C6D578 /* si-66-smime.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A4E15A3ABD400C6D578 /* si-66-smime.c */; };
-               4CC92A9A15A3ABD400C6D578 /* Global Trustee.cer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CC92A5015A3ABD400C6D578 /* Global Trustee.cer.h */; };
-               4CC92A9B15A3ABD400C6D578 /* UTN-USERFirst-Hardware.cer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CC92A5115A3ABD400C6D578 /* UTN-USERFirst-Hardware.cer.h */; };
-               4CC92A9C15A3ABD400C6D578 /* addons.mozilla.org.cer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CC92A5215A3ABD400C6D578 /* addons.mozilla.org.cer.h */; };
-               4CC92A9D15A3ABD400C6D578 /* login.live.com.cer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CC92A5315A3ABD400C6D578 /* login.live.com.cer.h */; };
-               4CC92A9E15A3ABD400C6D578 /* login.skype.com.cer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CC92A5415A3ABD400C6D578 /* login.skype.com.cer.h */; };
-               4CC92A9F15A3ABD400C6D578 /* login.yahoo.com.1.cer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CC92A5515A3ABD400C6D578 /* login.yahoo.com.1.cer.h */; };
-               4CC92AA015A3ABD400C6D578 /* login.yahoo.com.2.cer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CC92A5615A3ABD400C6D578 /* login.yahoo.com.2.cer.h */; };
-               4CC92AA115A3ABD400C6D578 /* login.yahoo.com.cer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CC92A5715A3ABD400C6D578 /* login.yahoo.com.cer.h */; };
-               4CC92AA215A3ABD400C6D578 /* mail.google.com.cer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CC92A5815A3ABD400C6D578 /* mail.google.com.cer.h */; };
-               4CC92AA315A3ABD400C6D578 /* www.google.com.cer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CC92A5915A3ABD400C6D578 /* www.google.com.cer.h */; };
-               4CC92AA415A3ABD400C6D578 /* si-67-sectrust-blacklist.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A5A15A3ABD400C6D578 /* si-67-sectrust-blacklist.c */; };
                4CC92AA515A3ABD400C6D578 /* vmdh-40.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A5C15A3ABD400C6D578 /* vmdh-40.c */; };
                4CC92AA615A3ABD400C6D578 /* vmdh-41-example.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A5D15A3ABD400C6D578 /* vmdh-41-example.c */; };
                4CC92AA715A3ABD400C6D578 /* vmdh-42-example2.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A5E15A3ABD400C6D578 /* vmdh-42-example2.c */; };
                4CC92AA515A3ABD400C6D578 /* vmdh-40.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A5C15A3ABD400C6D578 /* vmdh-40.c */; };
                4CC92AA615A3ABD400C6D578 /* vmdh-41-example.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A5D15A3ABD400C6D578 /* vmdh-41-example.c */; };
                4CC92AA715A3ABD400C6D578 /* vmdh-42-example2.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A5E15A3ABD400C6D578 /* vmdh-42-example2.c */; };
@@ -262,17 +248,13 @@
                4CCD1B021B1E404500F6DF8D /* secd-74-engine-beer-servers.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CCD1B001B1E3EA200F6DF8D /* secd-74-engine-beer-servers.c */; };
                4CD1897D169F835400BC96B8 /* print_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CD1897B169F835400BC96B8 /* print_cert.c */; };
                521C0CD615FF9B3300604B61 /* SOSRegressionUtilities.c in Sources */ = {isa = PBXBuildFile; fileRef = 521C0CD515FF9B3300604B61 /* SOSRegressionUtilities.c */; };
                4CCD1B021B1E404500F6DF8D /* secd-74-engine-beer-servers.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CCD1B001B1E3EA200F6DF8D /* secd-74-engine-beer-servers.c */; };
                4CD1897D169F835400BC96B8 /* print_cert.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CD1897B169F835400BC96B8 /* print_cert.c */; };
                521C0CD615FF9B3300604B61 /* SOSRegressionUtilities.c in Sources */ = {isa = PBXBuildFile; fileRef = 521C0CD515FF9B3300604B61 /* SOSRegressionUtilities.c */; };
-               521C0CDD15FFA05100604B61 /* CKDKeyValueStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 521C0CD915FFA05000604B61 /* CKDKeyValueStore.h */; };
                521C68601614A6E100E31C3E /* SOSCloudKeychainClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 521C685D1614A6E100E31C3E /* SOSCloudKeychainClient.h */; settings = {ATTRIBUTES = (); }; };
                521C68601614A6E100E31C3E /* SOSCloudKeychainClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 521C685D1614A6E100E31C3E /* SOSCloudKeychainClient.h */; settings = {ATTRIBUTES = (); }; };
+               5221C4981CBEDB7C006047E7 /* secd-71-engine-save.c in Sources */ = {isa = PBXBuildFile; fileRef = 5221C4971CBEDB7C006047E7 /* secd-71-engine-save.c */; };
+               5221C4C21CC5667E006047E7 /* secd-71-engine-save-sample1.h in Headers */ = {isa = PBXBuildFile; fileRef = 5221C4C11CC5667E006047E7 /* secd-71-engine-save-sample1.h */; };
                523CBBF61B321C6A002C0884 /* secd-50-message.c in Sources */ = {isa = PBXBuildFile; fileRef = 523CBBF41B321C5C002C0884 /* secd-50-message.c */; };
                523CBBF91B3227B5002C0884 /* secd-49-manifests.c in Sources */ = {isa = PBXBuildFile; fileRef = 523CBBF71B3227A2002C0884 /* secd-49-manifests.c */; };
                525394AE1660A30000BA9687 /* SecDbItem.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C4B15931655ED9000734590 /* SecDbItem.c */; };
                527258D11981C00F003CFCEC /* secd-70-engine.c in Sources */ = {isa = PBXBuildFile; fileRef = 527258CF1981C00F003CFCEC /* secd-70-engine.c */; };
                523CBBF61B321C6A002C0884 /* secd-50-message.c in Sources */ = {isa = PBXBuildFile; fileRef = 523CBBF41B321C5C002C0884 /* secd-50-message.c */; };
                523CBBF91B3227B5002C0884 /* secd-49-manifests.c in Sources */ = {isa = PBXBuildFile; fileRef = 523CBBF71B3227A2002C0884 /* secd-49-manifests.c */; };
                525394AE1660A30000BA9687 /* SecDbItem.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C4B15931655ED9000734590 /* SecDbItem.c */; };
                527258D11981C00F003CFCEC /* secd-70-engine.c in Sources */ = {isa = PBXBuildFile; fileRef = 527258CF1981C00F003CFCEC /* secd-70-engine.c */; };
-               528402AE164446410035F320 /* CKDKVSProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 521C0BB015FA5E3F00604B61 /* CKDKVSProxy.m */; };
-               528402AF164446410035F320 /* CKDPersistentState.m in Sources */ = {isa = PBXBuildFile; fileRef = 521C0BB215FA5E3F00604B61 /* CKDPersistentState.m */; };
-               528402B1164446410035F320 /* CKDUserInteraction.m in Sources */ = {isa = PBXBuildFile; fileRef = 52840292164050C80035F320 /* CKDUserInteraction.m */; };
-               528402B2164447610035F320 /* SOSCloudKeychainConstants.c in Sources */ = {isa = PBXBuildFile; fileRef = E7217B2515F8131A00D26031 /* SOSCloudKeychainConstants.c */; };
-               5284629B1AE6FCF0004C1BA2 /* SOSBackupEvent.c in Sources */ = {isa = PBXBuildFile; fileRef = 528462991AE6FCF0004C1BA2 /* SOSBackupEvent.c */; };
                5284629C1AE6FCF0004C1BA2 /* SOSBackupEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 5284629A1AE6FCF0004C1BA2 /* SOSBackupEvent.h */; };
                529F46F31AEC7A2E0002392C /* secd-34-backup-der-parse.c in Sources */ = {isa = PBXBuildFile; fileRef = 529F46F11AEC759E0002392C /* secd-34-backup-der-parse.c */; };
                52BF439C1AFC50EC00821B5D /* SecItemConstants.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD563914CB6EB9008233F2 /* SecItemConstants.c */; };
                5284629C1AE6FCF0004C1BA2 /* SOSBackupEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 5284629A1AE6FCF0004C1BA2 /* SOSBackupEvent.h */; };
                529F46F31AEC7A2E0002392C /* secd-34-backup-der-parse.c in Sources */ = {isa = PBXBuildFile; fileRef = 529F46F11AEC759E0002392C /* secd-34-backup-der-parse.c */; };
                52BF439C1AFC50EC00821B5D /* SecItemConstants.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD563914CB6EB9008233F2 /* SecItemConstants.c */; };
@@ -283,21 +265,19 @@
                52FD82A01AEAC8C100634FD3 /* SecItemBackup.c in Sources */ = {isa = PBXBuildFile; fileRef = 52FD82981AEA9CEF00634FD3 /* SecItemBackup.c */; };
                5356520318E3C71000C383C0 /* SecOTRRemote.c in Sources */ = {isa = PBXBuildFile; fileRef = 5356520218E3C71000C383C0 /* SecOTRRemote.c */; };
                5384299418E492A300E91AFE /* secd-70-otr-remote.c in Sources */ = {isa = PBXBuildFile; fileRef = 5384299318E492A300E91AFE /* secd-70-otr-remote.c */; };
                52FD82A01AEAC8C100634FD3 /* SecItemBackup.c in Sources */ = {isa = PBXBuildFile; fileRef = 52FD82981AEA9CEF00634FD3 /* SecItemBackup.c */; };
                5356520318E3C71000C383C0 /* SecOTRRemote.c in Sources */ = {isa = PBXBuildFile; fileRef = 5356520218E3C71000C383C0 /* SecOTRRemote.c */; };
                5384299418E492A300E91AFE /* secd-70-otr-remote.c in Sources */ = {isa = PBXBuildFile; fileRef = 5384299318E492A300E91AFE /* secd-70-otr-remote.c */; };
-               5DE4A7BD17441CCD0036339E /* si-71-mobile-store-policy.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DE4A7BC17441CCD0036339E /* si-71-mobile-store-policy.c */; };
+               5E0CE1651CB6347300E75776 /* secd-83-item-match-valid-on-date.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E0CE1641CB6347300E75776 /* secd-83-item-match-valid-on-date.m */; };
+               5E0CE1671CB6348D00E75776 /* secd-83-item-match-trusted.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E0CE1661CB6348D00E75776 /* secd-83-item-match-trusted.m */; };
                5E19C6481AA5F361005964F8 /* secd-81-item-acl-stress.c in Sources */ = {isa = PBXBuildFile; fileRef = 5E19C6471AA5F34E005964F8 /* secd-81-item-acl-stress.c */; };
                5EA016381AD41AC70061BCD7 /* secd-81-item-acl.c in Sources */ = {isa = PBXBuildFile; fileRef = 5EA016361AD41AB20061BCD7 /* secd-81-item-acl.c */; };
                5E19C6481AA5F361005964F8 /* secd-81-item-acl-stress.c in Sources */ = {isa = PBXBuildFile; fileRef = 5E19C6471AA5F34E005964F8 /* secd-81-item-acl-stress.c */; };
                5EA016381AD41AC70061BCD7 /* secd-81-item-acl.c in Sources */ = {isa = PBXBuildFile; fileRef = 5EA016361AD41AB20061BCD7 /* secd-81-item-acl.c */; };
+               5EF2596F1CB5214B009B4C58 /* secd-83-item-match-policy.m in Sources */ = {isa = PBXBuildFile; fileRef = 5EF2596E1CB5214B009B4C58 /* secd-83-item-match-policy.m */; };
                7249E1CB16C01E5F003D7268 /* OTATrustUtilities.c in Sources */ = {isa = PBXBuildFile; fileRef = 72E2DC0616BC47C800E7B236 /* OTATrustUtilities.c */; };
                7249E1CB16C01E5F003D7268 /* OTATrustUtilities.c in Sources */ = {isa = PBXBuildFile; fileRef = 72E2DC0616BC47C800E7B236 /* OTATrustUtilities.c */; };
-               7255A46C1783333D006A8B9A /* si-74-OTAPKISigner.c in Sources */ = {isa = PBXBuildFile; fileRef = 7255A46B1783333D006A8B9A /* si-74-OTAPKISigner.c */; };
-               7255F91417A973D5004A9F38 /* si-75-AppleIDRecordSigning.c in Sources */ = {isa = PBXBuildFile; fileRef = 7255F91317A973D5004A9F38 /* si-75-AppleIDRecordSigning.c */; };
                72B5923B17C6924000AE738B /* iCloudTrace.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B5923A17C6924000AE738B /* iCloudTrace.h */; };
                72B5923D17C6939A00AE738B /* iCloudTrace.c in Sources */ = {isa = PBXBuildFile; fileRef = 72B5923C17C6939A00AE738B /* iCloudTrace.c */; };
                72B5923B17C6924000AE738B /* iCloudTrace.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B5923A17C6924000AE738B /* iCloudTrace.h */; };
                72B5923D17C6939A00AE738B /* iCloudTrace.c in Sources */ = {isa = PBXBuildFile; fileRef = 72B5923C17C6939A00AE738B /* iCloudTrace.c */; };
-               7DE20930192D29D90066419C /* si-79-smp-cert-policy.c in Sources */ = {isa = PBXBuildFile; fileRef = 7DE2092F192D29D90066419C /* si-79-smp-cert-policy.c */; };
-               858A54681BC6FE62008A03FA /* si-88-sectrust-vpnprofile.c in Sources */ = {isa = PBXBuildFile; fileRef = 858A54641BC6FD3E008A03FA /* si-88-sectrust-vpnprofile.c */; };
-               858A54691BC6FE62008A03FA /* si-88-sectrust-vpnprofile.h in Headers */ = {isa = PBXBuildFile; fileRef = 858A54651BC6FD3E008A03FA /* si-88-sectrust-vpnprofile.h */; };
                ACFD56BE19007B2D00F5F5D9 /* ios6_1_keychain_2_db.h in Headers */ = {isa = PBXBuildFile; fileRef = ACFD56BD19007B2D00F5F5D9 /* ios6_1_keychain_2_db.h */; };
                BE061FCF1899E5BD00C739F6 /* si-76-shared-credentials.c in Sources */ = {isa = PBXBuildFile; fileRef = BE061FCE1899E5BD00C739F6 /* si-76-shared-credentials.c */; };
                ACFD56BE19007B2D00F5F5D9 /* ios6_1_keychain_2_db.h in Headers */ = {isa = PBXBuildFile; fileRef = ACFD56BD19007B2D00F5F5D9 /* ios6_1_keychain_2_db.h */; };
                BE061FCF1899E5BD00C739F6 /* si-76-shared-credentials.c in Sources */ = {isa = PBXBuildFile; fileRef = BE061FCE1899E5BD00C739F6 /* si-76-shared-credentials.c */; };
-               BE0CC6081A96B69000662E69 /* si-83-seccertificate-sighashalg.c in Sources */ = {isa = PBXBuildFile; fileRef = BE0CC6061A96B68400662E69 /* si-83-seccertificate-sighashalg.c */; };
-               BE3171931BB3559600BBB212 /* si-20-sectrust.h in Headers */ = {isa = PBXBuildFile; fileRef = BE3171921BB3559600BBB212 /* si-20-sectrust.h */; };
+               BE4AC7DE1C938698002A28FE /* SecSignatureVerificationSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = BE4AC7DC1C938698002A28FE /* SecSignatureVerificationSupport.c */; };
+               BE4AC7DF1C938698002A28FE /* SecSignatureVerificationSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = BE4AC7DD1C938698002A28FE /* SecSignatureVerificationSupport.h */; };
+               BE4AC7E01C9386B9002A28FE /* SecSignatureVerificationSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = BE4AC7DC1C938698002A28FE /* SecSignatureVerificationSupport.c */; };
                BE4AC9B518B8022D00B84964 /* swcagent_client.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF9640918B418A400813FA3 /* swcagent_client.h */; };
                BE4AC9B618B8038400B84964 /* SecuritydXPC.c in Sources */ = {isa = PBXBuildFile; fileRef = E7B01B8816572579000485F1 /* SecuritydXPC.c */; };
                BE53FA301B0AC5C300719A63 /* SecKey.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD563C14CB6EB9008233F2 /* SecKey.c */; };
                BE4AC9B518B8022D00B84964 /* swcagent_client.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF9640918B418A400813FA3 /* swcagent_client.h */; };
                BE4AC9B618B8038400B84964 /* SecuritydXPC.c in Sources */ = {isa = PBXBuildFile; fileRef = E7B01B8816572579000485F1 /* SecuritydXPC.c */; };
                BE53FA301B0AC5C300719A63 /* SecKey.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD563C14CB6EB9008233F2 /* SecKey.c */; };
@@ -305,30 +285,22 @@
                BE53FA321B0AC65B00719A63 /* SecRSAKey.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD564714CB6EB9008233F2 /* SecRSAKey.c */; };
                BE5EC1F018C80108005E7682 /* swcagent_client.c in Sources */ = {isa = PBXBuildFile; fileRef = BEF9640A18B418A400813FA3 /* swcagent_client.c */; };
                BE62D7601747FF3E001EAA9D /* si-72-syncableitems.c in Sources */ = {isa = PBXBuildFile; fileRef = BE62D75F1747FF3E001EAA9D /* si-72-syncableitems.c */; };
                BE53FA321B0AC65B00719A63 /* SecRSAKey.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD564714CB6EB9008233F2 /* SecRSAKey.c */; };
                BE5EC1F018C80108005E7682 /* swcagent_client.c in Sources */ = {isa = PBXBuildFile; fileRef = BEF9640A18B418A400813FA3 /* swcagent_client.c */; };
                BE62D7601747FF3E001EAA9D /* si-72-syncableitems.c in Sources */ = {isa = PBXBuildFile; fileRef = BE62D75F1747FF3E001EAA9D /* si-72-syncableitems.c */; };
-               BE62D7621747FF51001EAA9D /* si-70-sectrust-unified.c in Sources */ = {isa = PBXBuildFile; fileRef = BE62D7611747FF51001EAA9D /* si-70-sectrust-unified.c */; };
                BE642BB2188F32C200C899A2 /* SecSharedCredential.c in Sources */ = {isa = PBXBuildFile; fileRef = BE642BB1188F32C200C899A2 /* SecSharedCredential.c */; };
                BE642BB2188F32C200C899A2 /* SecSharedCredential.c in Sources */ = {isa = PBXBuildFile; fileRef = BE642BB1188F32C200C899A2 /* SecSharedCredential.c */; };
-               BE794826196DBEAD00F4BA63 /* si-81-sectrust-server-auth.c in Sources */ = {isa = PBXBuildFile; fileRef = BE794825196DBEAD00F4BA63 /* si-81-sectrust-server-auth.c */; };
                BE8D228F1ABB7253009A4E18 /* SecCertificate.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD562014CB6EB9008233F2 /* SecCertificate.c */; };
                BE8D22901ABB725C009A4E18 /* SecPolicy.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD564214CB6EB9008233F2 /* SecPolicy.c */; };
                BE8D22911ABB7264009A4E18 /* SecTrust.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD564C14CB6EB9008233F2 /* SecTrust.c */; };
                BE8D22921ABB726A009A4E18 /* SecTrustSettings.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD564F14CB6EB9008233F2 /* SecTrustSettings.c */; };
                BE8D22931ABB7272009A4E18 /* SecTrustStore.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD565214CB6EB9008233F2 /* SecTrustStore.c */; };
                BE8D22C21ABBA4D0009A4E18 /* SecCertificatePath.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD562314CB6EB9008233F2 /* SecCertificatePath.c */; };
                BE8D228F1ABB7253009A4E18 /* SecCertificate.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD562014CB6EB9008233F2 /* SecCertificate.c */; };
                BE8D22901ABB725C009A4E18 /* SecPolicy.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD564214CB6EB9008233F2 /* SecPolicy.c */; };
                BE8D22911ABB7264009A4E18 /* SecTrust.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD564C14CB6EB9008233F2 /* SecTrust.c */; };
                BE8D22921ABB726A009A4E18 /* SecTrustSettings.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD564F14CB6EB9008233F2 /* SecTrustSettings.c */; };
                BE8D22931ABB7272009A4E18 /* SecTrustStore.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD565214CB6EB9008233F2 /* SecTrustStore.c */; };
                BE8D22C21ABBA4D0009A4E18 /* SecCertificatePath.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD562314CB6EB9008233F2 /* SecCertificatePath.c */; };
-               BECC54E51B98FF0000FB91DC /* si-86-sectrust-eap-tls.c in Sources */ = {isa = PBXBuildFile; fileRef = BECC54E31B98FF0000FB91DC /* si-86-sectrust-eap-tls.c */; };
-               BECC54E61B98FF0000FB91DC /* si-86-sectrust-eap-tls.h in Headers */ = {isa = PBXBuildFile; fileRef = BECC54E41B98FF0000FB91DC /* si-86-sectrust-eap-tls.h */; };
                BEF9640D18B418A400813FA3 /* swcagent_client.c in Sources */ = {isa = PBXBuildFile; fileRef = BEF9640A18B418A400813FA3 /* swcagent_client.c */; };
                BEFE994E14F2E17200356A97 /* SecDH.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD562A14CB6EB9008233F2 /* SecDH.c */; };
                C6766768189884D200E9A12C /* SecAccessControl.c in Sources */ = {isa = PBXBuildFile; fileRef = C6766767189884D200E9A12C /* SecAccessControl.c */; };
                BEF9640D18B418A400813FA3 /* swcagent_client.c in Sources */ = {isa = PBXBuildFile; fileRef = BEF9640A18B418A400813FA3 /* swcagent_client.c */; };
                BEFE994E14F2E17200356A97 /* SecDH.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD562A14CB6EB9008233F2 /* SecDH.c */; };
                C6766768189884D200E9A12C /* SecAccessControl.c in Sources */ = {isa = PBXBuildFile; fileRef = C6766767189884D200E9A12C /* SecAccessControl.c */; };
-               CD0CB4761A81891300C058A4 /* IDSProxy.h in Sources */ = {isa = PBXBuildFile; fileRef = CD5D34011A80391B00EBF353 /* IDSProxy.h */; };
                CD0F8AF218998685003E0C52 /* SOSKVSKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = CD0F8AF118998685003E0C52 /* SOSKVSKeys.h */; };
                CD16F89A1AE84842004AE09C /* sc-150-ring.c in Sources */ = {isa = PBXBuildFile; fileRef = CD16F8941AE84822004AE09C /* sc-150-ring.c */; };
                CD32776B18F8AEFD006B5280 /* SOSPeerCoder.c in Sources */ = {isa = PBXBuildFile; fileRef = CD32776A18F8AEFD006B5280 /* SOSPeerCoder.c */; };
                CD32776D18F8B06E006B5280 /* SOSPeerCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = CD32776C18F8B06E006B5280 /* SOSPeerCoder.h */; };
                CD35B82A1C2650FE00E0852A /* secd-154-engine-backoff.c in Sources */ = {isa = PBXBuildFile; fileRef = CD35B8291C2650FE00E0852A /* secd-154-engine-backoff.c */; };
                CD3FD10716C3064B00A83BB6 /* SecuritydXPC.c in Sources */ = {isa = PBXBuildFile; fileRef = E7B01B8816572579000485F1 /* SecuritydXPC.c */; };
                CD0F8AF218998685003E0C52 /* SOSKVSKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = CD0F8AF118998685003E0C52 /* SOSKVSKeys.h */; };
                CD16F89A1AE84842004AE09C /* sc-150-ring.c in Sources */ = {isa = PBXBuildFile; fileRef = CD16F8941AE84822004AE09C /* sc-150-ring.c */; };
                CD32776B18F8AEFD006B5280 /* SOSPeerCoder.c in Sources */ = {isa = PBXBuildFile; fileRef = CD32776A18F8AEFD006B5280 /* SOSPeerCoder.c */; };
                CD32776D18F8B06E006B5280 /* SOSPeerCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = CD32776C18F8B06E006B5280 /* SOSPeerCoder.h */; };
                CD35B82A1C2650FE00E0852A /* secd-154-engine-backoff.c in Sources */ = {isa = PBXBuildFile; fileRef = CD35B8291C2650FE00E0852A /* secd-154-engine-backoff.c */; };
                CD3FD10716C3064B00A83BB6 /* SecuritydXPC.c in Sources */ = {isa = PBXBuildFile; fileRef = E7B01B8816572579000485F1 /* SecuritydXPC.c */; };
-               CD5D340B1A80391B00EBF353 /* IDSProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = CD5D34021A80391B00EBF353 /* IDSProxy.m */; };
-               CD5D340D1A80391B00EBF353 /* idskeychainsyncingproxy.m in Sources */ = {isa = PBXBuildFile; fileRef = CD5D34051A80391B00EBF353 /* idskeychainsyncingproxy.m */; };
-               CD63ACDB1A805D3E001B5671 /* SOSCloudKeychainConstants.c in Sources */ = {isa = PBXBuildFile; fileRef = E7217B2515F8131A00D26031 /* SOSCloudKeychainConstants.c */; };
                CD655E951AF02DDC00BD1B6E /* secd-62-account-backup.c in Sources */ = {isa = PBXBuildFile; fileRef = CD655E911AF02B9900BD1B6E /* secd-62-account-backup.c */; };
                CD655E961AF02F1800BD1B6E /* sc-150-backupkeyderivation.c in Sources */ = {isa = PBXBuildFile; fileRef = E7C4F5431AD482E1000B5862 /* sc-150-backupkeyderivation.c */; };
                CD773AC61ADDFDDB00C808BA /* SOSTransportBackupPeer.c in Sources */ = {isa = PBXBuildFile; fileRef = CD773AC21ADDF8C700C808BA /* SOSTransportBackupPeer.c */; };
                CD655E951AF02DDC00BD1B6E /* secd-62-account-backup.c in Sources */ = {isa = PBXBuildFile; fileRef = CD655E911AF02B9900BD1B6E /* secd-62-account-backup.c */; };
                CD655E961AF02F1800BD1B6E /* sc-150-backupkeyderivation.c in Sources */ = {isa = PBXBuildFile; fileRef = E7C4F5431AD482E1000B5862 /* sc-150-backupkeyderivation.c */; };
                CD773AC61ADDFDDB00C808BA /* SOSTransportBackupPeer.c in Sources */ = {isa = PBXBuildFile; fileRef = CD773AC21ADDF8C700C808BA /* SOSTransportBackupPeer.c */; };
@@ -337,8 +309,8 @@
                CD95312B19228D8D005A76B2 /* SOSTransportTestTransports.c in Sources */ = {isa = PBXBuildFile; fileRef = CDAD4E9818EC8424007D4BC2 /* SOSTransportTestTransports.c */; };
                CD95312C19228D92005A76B2 /* SOSTransportTestTransports.h in Headers */ = {isa = PBXBuildFile; fileRef = CDAD4E9A18EC8447007D4BC2 /* SOSTransportTestTransports.h */; };
                CD95312D19228D96005A76B2 /* SOSAccountTesting.h in Headers */ = {isa = PBXBuildFile; fileRef = E7A10FAA1771245D00C4602F /* SOSAccountTesting.h */; };
                CD95312B19228D8D005A76B2 /* SOSTransportTestTransports.c in Sources */ = {isa = PBXBuildFile; fileRef = CDAD4E9818EC8424007D4BC2 /* SOSTransportTestTransports.c */; };
                CD95312C19228D92005A76B2 /* SOSTransportTestTransports.h in Headers */ = {isa = PBXBuildFile; fileRef = CDAD4E9A18EC8447007D4BC2 /* SOSTransportTestTransports.h */; };
                CD95312D19228D96005A76B2 /* SOSAccountTesting.h in Headers */ = {isa = PBXBuildFile; fileRef = E7A10FAA1771245D00C4602F /* SOSAccountTesting.h */; };
+               CD9B54131CC6EED100CC487A /* secd-100-initialsync.c in Sources */ = {isa = PBXBuildFile; fileRef = CD9B54111CC6EC4D00CC487A /* secd-100-initialsync.c */; };
                CDA0CB55194B95C400EF624D /* IDSFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD558FA8193544F800CFB3B1 /* IDSFoundation.framework */; };
                CDA0CB55194B95C400EF624D /* IDSFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD558FA8193544F800CFB3B1 /* IDSFoundation.framework */; };
-               CDA9828A197F0C3C006A0A9F /* cloudkeychainproxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 521C0BB315FA5E3F00604B61 /* cloudkeychainproxy.m */; };
                CDAD4E9C18EC9B3D007D4BC2 /* SOSAccountTesting.h in Headers */ = {isa = PBXBuildFile; fileRef = E7A10FAA1771245D00C4602F /* SOSAccountTesting.h */; };
                CDAD4E9D18EC9B67007D4BC2 /* SOSTransportTestTransports.c in Sources */ = {isa = PBXBuildFile; fileRef = CDAD4E9818EC8424007D4BC2 /* SOSTransportTestTransports.c */; };
                CDAD4E9E18EC9B6D007D4BC2 /* SOSTransportTestTransports.h in Headers */ = {isa = PBXBuildFile; fileRef = CDAD4E9A18EC8447007D4BC2 /* SOSTransportTestTransports.h */; };
                CDAD4E9C18EC9B3D007D4BC2 /* SOSAccountTesting.h in Headers */ = {isa = PBXBuildFile; fileRef = E7A10FAA1771245D00C4602F /* SOSAccountTesting.h */; };
                CDAD4E9D18EC9B67007D4BC2 /* SOSTransportTestTransports.c in Sources */ = {isa = PBXBuildFile; fileRef = CDAD4E9818EC8424007D4BC2 /* SOSTransportTestTransports.c */; };
                CDAD4E9E18EC9B6D007D4BC2 /* SOSTransportTestTransports.h in Headers */ = {isa = PBXBuildFile; fileRef = CDAD4E9A18EC8447007D4BC2 /* SOSTransportTestTransports.h */; };
@@ -346,7 +318,6 @@
                CDB6A8B81A409BC600646CD6 /* otr-60-slowroll.c in Sources */ = {isa = PBXBuildFile; fileRef = CDB6A8B71A409BC600646CD6 /* otr-60-slowroll.c */; };
                CDC765C21729A72800721712 /* SecPasswordGenerate.c in Sources */ = {isa = PBXBuildFile; fileRef = CDC765C01729A72800721712 /* SecPasswordGenerate.c */; };
                CDC765C41729A72800721712 /* SecPasswordGenerate.h in Headers */ = {isa = PBXBuildFile; fileRef = CDC765C11729A72800721712 /* SecPasswordGenerate.h */; };
                CDB6A8B81A409BC600646CD6 /* otr-60-slowroll.c in Sources */ = {isa = PBXBuildFile; fileRef = CDB6A8B71A409BC600646CD6 /* otr-60-slowroll.c */; };
                CDC765C21729A72800721712 /* SecPasswordGenerate.c in Sources */ = {isa = PBXBuildFile; fileRef = CDC765C01729A72800721712 /* SecPasswordGenerate.c */; };
                CDC765C41729A72800721712 /* SecPasswordGenerate.h in Headers */ = {isa = PBXBuildFile; fileRef = CDC765C11729A72800721712 /* SecPasswordGenerate.h */; };
-               CDD450111ACF13BC00A37449 /* IDSPersistentState.m in Sources */ = {isa = PBXBuildFile; fileRef = CDD450101ACF13BC00A37449 /* IDSPersistentState.m */; };
                CDD565A2173193AC00B6B074 /* si-73-secpasswordgenerate.c in Sources */ = {isa = PBXBuildFile; fileRef = CDD565A1173193AC00B6B074 /* si-73-secpasswordgenerate.c */; };
                CDDEF81A19465E2E0069763C /* IDSFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD558FA8193544F800CFB3B1 /* IDSFoundation.framework */; };
                CDE5F87B1AF025A40074958E /* SOSRingDER.c in Sources */ = {isa = PBXBuildFile; fileRef = CDC0DC321AE83E390020BA6C /* SOSRingDER.c */; };
                CDD565A2173193AC00B6B074 /* si-73-secpasswordgenerate.c in Sources */ = {isa = PBXBuildFile; fileRef = CDD565A1173193AC00B6B074 /* si-73-secpasswordgenerate.c */; };
                CDDEF81A19465E2E0069763C /* IDSFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD558FA8193544F800CFB3B1 /* IDSFoundation.framework */; };
                CDE5F87B1AF025A40074958E /* SOSRingDER.c in Sources */ = {isa = PBXBuildFile; fileRef = CDC0DC321AE83E390020BA6C /* SOSRingDER.c */; };
@@ -372,13 +343,8 @@
                CDE5F88F1AF025B80074958E /* SOSCircleV2.c in Sources */ = {isa = PBXBuildFile; fileRef = CDC0DC961AE842640020BA6C /* SOSCircleV2.c */; };
                CDE5F8901AF025B80074958E /* SOSCircleV2.h in Headers */ = {isa = PBXBuildFile; fileRef = CDC0DC971AE842640020BA6C /* SOSCircleV2.h */; };
                CDE5F8911AF025B80074958E /* SOSCircleRings.h in Headers */ = {isa = PBXBuildFile; fileRef = 484182621A30F38E00211511 /* SOSCircleRings.h */; };
                CDE5F88F1AF025B80074958E /* SOSCircleV2.c in Sources */ = {isa = PBXBuildFile; fileRef = CDC0DC961AE842640020BA6C /* SOSCircleV2.c */; };
                CDE5F8901AF025B80074958E /* SOSCircleV2.h in Headers */ = {isa = PBXBuildFile; fileRef = CDC0DC971AE842640020BA6C /* SOSCircleV2.h */; };
                CDE5F8911AF025B80074958E /* SOSCircleRings.h in Headers */ = {isa = PBXBuildFile; fileRef = 484182621A30F38E00211511 /* SOSCircleRings.h */; };
-               CDE5F89A1AF025BE0074958E /* SOSAccount.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC929AD15A3957800C6D578 /* SOSAccount.c */; };
                CDE5F89B1AF025BE0074958E /* SOSAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CC929AE15A3957800C6D578 /* SOSAccount.h */; };
                CDE5F89B1AF025BE0074958E /* SOSAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 4CC929AE15A3957800C6D578 /* SOSAccount.h */; };
-               CDE5F89C1AF025BE0074958E /* SOSAccountBackup.c in Sources */ = {isa = PBXBuildFile; fileRef = E7C4F5451AD75EBE000B5862 /* SOSAccountBackup.c */; };
                CDE5F89D1AF025BE0074958E /* SOSAccountPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 48764AEA17FA31670005C4F1 /* SOSAccountPriv.h */; };
                CDE5F89D1AF025BE0074958E /* SOSAccountPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 48764AEA17FA31670005C4F1 /* SOSAccountPriv.h */; };
-               CDE5F89E1AF025BE0074958E /* SOSAccountRings.c in Sources */ = {isa = PBXBuildFile; fileRef = CDC0DC941AE842640020BA6C /* SOSAccountRings.c */; };
-               CDE5F89F1AF025BE0074958E /* SOSAccountRingUpdate.c in Sources */ = {isa = PBXBuildFile; fileRef = CDC0DC951AE842640020BA6C /* SOSAccountRingUpdate.c */; };
-               CDE5F8A01AF025BE0074958E /* SOSBackupSliceKeyBag.c in Sources */ = {isa = PBXBuildFile; fileRef = E71BAE801ACE1C6500DF0C29 /* SOSBackupSliceKeyBag.c */; };
                CDE5F8A11AF025BE0074958E /* SOSBackupSliceKeyBag.h in Headers */ = {isa = PBXBuildFile; fileRef = E71BAE811ACE1C6500DF0C29 /* SOSBackupSliceKeyBag.h */; };
                CDE5F8A21AF025D60074958E /* SOSPeerInfoDER.c in Sources */ = {isa = PBXBuildFile; fileRef = E7DBB6081AEAAF3700488C1F /* SOSPeerInfoDER.c */; };
                CDE5F8A31AF025D60074958E /* SOSPeerInfoDER.h in Headers */ = {isa = PBXBuildFile; fileRef = E7DBB6091AEAAF3700488C1F /* SOSPeerInfoDER.h */; };
                CDE5F8A11AF025BE0074958E /* SOSBackupSliceKeyBag.h in Headers */ = {isa = PBXBuildFile; fileRef = E71BAE811ACE1C6500DF0C29 /* SOSBackupSliceKeyBag.h */; };
                CDE5F8A21AF025D60074958E /* SOSPeerInfoDER.c in Sources */ = {isa = PBXBuildFile; fileRef = E7DBB6081AEAAF3700488C1F /* SOSPeerInfoDER.c */; };
                CDE5F8A31AF025D60074958E /* SOSPeerInfoDER.h in Headers */ = {isa = PBXBuildFile; fileRef = E7DBB6091AEAAF3700488C1F /* SOSPeerInfoDER.h */; };
@@ -403,19 +369,52 @@
                CDE5F8B91AF026470074958E /* SOSTransportMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = CD0F8AF71899BF57003E0C52 /* SOSTransportMessage.h */; };
                CDE5F8BA1AF026470074958E /* SOSTransportMessageKVS.c in Sources */ = {isa = PBXBuildFile; fileRef = CD32777618F8B39B006B5280 /* SOSTransportMessageKVS.c */; };
                CDE5F8BB1AF026470074958E /* SOSTransportMessageKVS.h in Headers */ = {isa = PBXBuildFile; fileRef = CD32777818F8B3B4006B5280 /* SOSTransportMessageKVS.h */; };
                CDE5F8B91AF026470074958E /* SOSTransportMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = CD0F8AF71899BF57003E0C52 /* SOSTransportMessage.h */; };
                CDE5F8BA1AF026470074958E /* SOSTransportMessageKVS.c in Sources */ = {isa = PBXBuildFile; fileRef = CD32777618F8B39B006B5280 /* SOSTransportMessageKVS.c */; };
                CDE5F8BB1AF026470074958E /* SOSTransportMessageKVS.h in Headers */ = {isa = PBXBuildFile; fileRef = CD32777818F8B3B4006B5280 /* SOSTransportMessageKVS.h */; };
-               CDF42C071A884BB10080BB05 /* idksmain.m in Sources */ = {isa = PBXBuildFile; fileRef = CDF42C061A884BB10080BB05 /* idksmain.m */; };
                CDF9BBE11B03E24D00D1AF0F /* secd-52-offering-gencount-reset.c in Sources */ = {isa = PBXBuildFile; fileRef = CDF9BBE01B03E24D00D1AF0F /* secd-52-offering-gencount-reset.c */; };
                CDF9BBE11B03E24D00D1AF0F /* secd-52-offering-gencount-reset.c in Sources */ = {isa = PBXBuildFile; fileRef = CDF9BBE01B03E24D00D1AF0F /* secd-52-offering-gencount-reset.c */; };
-               D40294A91C20A806008CE4B6 /* si-91-sectrust-ast2.c in Sources */ = {isa = PBXBuildFile; fileRef = D40294A71C20A806008CE4B6 /* si-91-sectrust-ast2.c */; };
-               D40294AA1C20A806008CE4B6 /* si-91-sectrust-ast2.h in Headers */ = {isa = PBXBuildFile; fileRef = D40294A81C20A806008CE4B6 /* si-91-sectrust-ast2.h */; };
-               D41380C91C6E529500F1A4B6 /* si-92-sectrust-homekit.c in Sources */ = {isa = PBXBuildFile; fileRef = D41380C71C6E529500F1A4B6 /* si-92-sectrust-homekit.c */; };
-               D41380CA1C6E529500F1A4B6 /* si-92-sectrust-homekit.h in Headers */ = {isa = PBXBuildFile; fileRef = D41380C81C6E529500F1A4B6 /* si-92-sectrust-homekit.h */; };
+               D40771BE1C9B50590016AA66 /* si-82-seccertificate-ct.c in Sources */ = {isa = PBXBuildFile; fileRef = D40771AB1C9B4C530016AA66 /* si-82-seccertificate-ct.c */; };
+               D40771BF1C9B50590016AA66 /* si-82-sectrust-ct.m in Sources */ = {isa = PBXBuildFile; fileRef = D40771AC1C9B4C530016AA66 /* si-82-sectrust-ct.m */; };
                D4273AA61B5D54E70007D67B /* nameconstraints.c in Sources */ = {isa = PBXBuildFile; fileRef = D4273AA21B5D54CA0007D67B /* nameconstraints.c */; };
                D4273AA61B5D54E70007D67B /* nameconstraints.c in Sources */ = {isa = PBXBuildFile; fileRef = D4273AA21B5D54CA0007D67B /* nameconstraints.c */; };
-               D445CDE11B44D53C005040AC /* si-84-sectrust-atv-appsigning.c in Sources */ = {isa = PBXBuildFile; fileRef = D445CDDF1B44D372005040AC /* si-84-sectrust-atv-appsigning.c */; };
-               D4B4A9A81B8BB9B70097B393 /* si-85-sectrust-ssl-policy.c in Sources */ = {isa = PBXBuildFile; fileRef = D4B4A9A61B8801960097B393 /* si-85-sectrust-ssl-policy.c */; };
+               D43CDF731C9C77540020217E /* si-28-sectrustsettings.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2E15A3ABD400C6D578 /* si-28-sectrustsettings.m */; };
+               D442160A1CCAD9C200D2D455 /* si-22-sectrust-iap.h in Headers */ = {isa = PBXBuildFile; fileRef = D44216091CCAD9C200D2D455 /* si-22-sectrust-iap.h */; };
+               D44C81E81CD1944C00BE9A0D /* si-97-sectrust-path-scoring.m in Sources */ = {isa = PBXBuildFile; fileRef = D44C81E71CD1944C00BE9A0D /* si-97-sectrust-path-scoring.m */; };
+               D44C81EA1CD1947200BE9A0D /* si-97-sectrust-path-scoring.h in Headers */ = {isa = PBXBuildFile; fileRef = D44C81E91CD1947200BE9A0D /* si-97-sectrust-path-scoring.h */; };
+               D45FC3E71C9E084B00509CDA /* SecBase64.c in Sources */ = {isa = PBXBuildFile; fileRef = 18AD561D14CB6EB9008233F2 /* SecBase64.c */; };
+               D4653DEB1C9E2299002ED6D5 /* si-28-sectrustsettings.h in Headers */ = {isa = PBXBuildFile; fileRef = D4653DEA1C9E2299002ED6D5 /* si-28-sectrustsettings.h */; };
+               D4704F341C76AEB600E15025 /* SecPolicyLeafCallbacks.c in Sources */ = {isa = PBXBuildFile; fileRef = D48C567C1C73E5C300E41928 /* SecPolicyLeafCallbacks.c */; };
+               D474EF341C8A1CBC00AA4D86 /* personalization.c in Sources */ = {isa = PBXBuildFile; fileRef = D474EF321C8A1CBB00AA4D86 /* personalization.c */; };
+               D474EF351C8A1CBC00AA4D86 /* personalization.h in Headers */ = {isa = PBXBuildFile; fileRef = D474EF331C8A1CBB00AA4D86 /* personalization.h */; };
+               D47F511D1C3B660500A7CEFE /* SecCFAllocator.c in Sources */ = {isa = PBXBuildFile; fileRef = D47F511B1C3B660500A7CEFE /* SecCFAllocator.c */; };
+               D47F511E1C3B660500A7CEFE /* SecCFAllocator.c in Sources */ = {isa = PBXBuildFile; fileRef = D47F511B1C3B660500A7CEFE /* SecCFAllocator.c */; };
+               D47F511F1C3B660500A7CEFE /* SecCFAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = D47F511C1C3B660500A7CEFE /* SecCFAllocator.h */; };
+               D483DF6A1CD2DF9B00334824 /* si-20-sectrust.h in Headers */ = {isa = PBXBuildFile; fileRef = BE3171921BB3559600BBB212 /* si-20-sectrust.h */; };
+               D48C567D1C73E5C300E41928 /* SecPolicyLeafCallbacks.c in Sources */ = {isa = PBXBuildFile; fileRef = D48C567C1C73E5C300E41928 /* SecPolicyLeafCallbacks.c */; };
+               D4A919771CA9A3DD003D2ADA /* si-95-cms-basic.c in Sources */ = {isa = PBXBuildFile; fileRef = D4A919751CA9A3DD003D2ADA /* si-95-cms-basic.c */; };
+               D4A919781CA9A3DD003D2ADA /* si-95-cms-basic.h in Headers */ = {isa = PBXBuildFile; fileRef = D4A919761CA9A3DD003D2ADA /* si-95-cms-basic.h */; };
                D4CBC1481BE9A89E00C5795E /* si-89-cms-hash-agility.c in Sources */ = {isa = PBXBuildFile; fileRef = D4CBC1461BE9A89E00C5795E /* si-89-cms-hash-agility.c */; };
                D4CBC1491BE9A89E00C5795E /* si-89-cms-hash-agility.h in Headers */ = {isa = PBXBuildFile; fileRef = D4CBC1471BE9A89E00C5795E /* si-89-cms-hash-agility.h */; };
                D4CBC1481BE9A89E00C5795E /* si-89-cms-hash-agility.c in Sources */ = {isa = PBXBuildFile; fileRef = D4CBC1461BE9A89E00C5795E /* si-89-cms-hash-agility.c */; };
                D4CBC1491BE9A89E00C5795E /* si-89-cms-hash-agility.h in Headers */ = {isa = PBXBuildFile; fileRef = D4CBC1471BE9A89E00C5795E /* si-89-cms-hash-agility.h */; };
-               D4DFC94A1B9958D00040945C /* si-87-sectrust-name-constraints.c in Sources */ = {isa = PBXBuildFile; fileRef = D4DFC9481B9958D00040945C /* si-87-sectrust-name-constraints.c */; };
-               D4DFC94B1B9958D00040945C /* si-87-sectrust-name-constraints.h in Headers */ = {isa = PBXBuildFile; fileRef = D4DFC9491B9958D00040945C /* si-87-sectrust-name-constraints.h */; };
+               D4D886C11CEB9FAC00DC7583 /* si-87-sectrust-name-constraints.c in Sources */ = {isa = PBXBuildFile; fileRef = D4DFC9481B9958D00040945C /* si-87-sectrust-name-constraints.c */; };
+               D4D886C21CEB9FC600DC7583 /* si-85-sectrust-ssl-policy.c in Sources */ = {isa = PBXBuildFile; fileRef = D4B4A9A61B8801960097B393 /* si-85-sectrust-ssl-policy.c */; };
+               D4D886EB1CEBF9C300DC7583 /* si-15-certificate.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A1C15A3ABD400C6D578 /* si-15-certificate.c */; };
+               D4D886EC1CEBF9C700DC7583 /* si-16-ec-certificate.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A1D15A3ABD400C6D578 /* si-16-ec-certificate.c */; };
+               D4D886ED1CEC006100DC7583 /* si-20-sectrust.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A1F15A3ABD400C6D578 /* si-20-sectrust.c */; };
+               D4D886EE1CEC007000DC7583 /* si-21-sectrust-asr.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2015A3ABD400C6D578 /* si-21-sectrust-asr.c */; };
+               D4D886EF1CEC007900DC7583 /* si-22-sectrust-iap.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2115A3ABD400C6D578 /* si-22-sectrust-iap.c */; };
+               D4D886F01CEC008600DC7583 /* si-23-sectrust-ocsp.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2215A3ABD400C6D578 /* si-23-sectrust-ocsp.c */; };
+               D4D886F11CECE75000DC7583 /* SecTrustInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BE8D22C11ABB9B6E009A4E18 /* SecTrustInternal.h */; };
+               D4D886F41CED027800DC7583 /* si-24-sectrust-itms.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2615A3ABD400C6D578 /* si-24-sectrust-itms.c */; };
+               D4D886F51CED027D00DC7583 /* si-24-sectrust-nist.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2815A3ABD400C6D578 /* si-24-sectrust-nist.c */; };
+               D4D887531CED0A9100DC7583 /* si-24-sectrust-digicert-malaysia.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2415A3ABD400C6D578 /* si-24-sectrust-digicert-malaysia.c */; };
+               D4D887541CED0A9700DC7583 /* si-24-sectrust-diginotar.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2515A3ABD400C6D578 /* si-24-sectrust-diginotar.c */; };
+               D4D887551CED0B7D00DC7583 /* si-24-sectrust-passbook.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2A15A3ABD400C6D578 /* si-24-sectrust-passbook.c */; };
+               D4D887561CED0B8600DC7583 /* si-26-sectrust-copyproperties.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2C15A3ABD400C6D578 /* si-26-sectrust-copyproperties.c */; };
+               D4D887571CED0B9400DC7583 /* si-27-sectrust-exceptions.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A2D15A3ABD400C6D578 /* si-27-sectrust-exceptions.c */; };
+               D4D887581CED40A000DC7583 /* si-71-mobile-store-policy.c in Sources */ = {isa = PBXBuildFile; fileRef = 5DE4A7BC17441CCD0036339E /* si-71-mobile-store-policy.c */; };
+               D4D887591CED40A500DC7583 /* si-70-sectrust-unified.c in Sources */ = {isa = PBXBuildFile; fileRef = BE62D7611747FF51001EAA9D /* si-70-sectrust-unified.c */; };
+               D4D8875A1CED40AA00DC7583 /* si-67-sectrust-blacklist.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC92A5A15A3ABD400C6D578 /* si-67-sectrust-blacklist.c */; };
+               D4D8875E1CED490700DC7583 /* si-74-OTAPKISigner.c in Sources */ = {isa = PBXBuildFile; fileRef = 7255A46B1783333D006A8B9A /* si-74-OTAPKISigner.c */; };
+               D4D8875F1CED491A00DC7583 /* si-83-seccertificate-sighashalg.c in Sources */ = {isa = PBXBuildFile; fileRef = BE0CC6061A96B68400662E69 /* si-83-seccertificate-sighashalg.c */; };
+               D4D9BA2E1C7E5F19008785EB /* SecTrustInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BE8D22C11ABB9B6E009A4E18 /* SecTrustInternal.h */; };
+               D4D9BA2F1C7E611C008785EB /* SecServerEncryptionSupport.c in Sources */ = {isa = PBXBuildFile; fileRef = E795C9531913F88D00FA068C /* SecServerEncryptionSupport.c */; };
+               D4EC94FF1CEA4A870083E753 /* si-20-sectrust-policies.m in Sources */ = {isa = PBXBuildFile; fileRef = D4EC94D31CEA47D70083E753 /* si-20-sectrust-policies.m */; };
                E703811514E1FEEF007CB458 /* SOSCloudCircle.h in Headers */ = {isa = PBXBuildFile; fileRef = E703811114E1FEE4007CB458 /* SOSCloudCircle.h */; };
                E71049F3169E023B00DB0045 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 521C0B9815FA5C4A00604B61 /* Foundation.framework */; };
                E7104A01169E036E00DB0045 /* SecurityTool.c in Sources */ = {isa = PBXBuildFile; fileRef = E71049FF169E036E00DB0045 /* SecurityTool.c */; };
                E703811514E1FEEF007CB458 /* SOSCloudCircle.h in Headers */ = {isa = PBXBuildFile; fileRef = E703811114E1FEE4007CB458 /* SOSCloudCircle.h */; };
                E71049F3169E023B00DB0045 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 521C0B9815FA5C4A00604B61 /* Foundation.framework */; };
                E7104A01169E036E00DB0045 /* SecurityTool.c in Sources */ = {isa = PBXBuildFile; fileRef = E71049FF169E036E00DB0045 /* SecurityTool.c */; };
@@ -423,13 +422,31 @@
                E71BAE7F1ACE1AB900DF0C29 /* sc-153-backupslicekeybag.c in Sources */ = {isa = PBXBuildFile; fileRef = E71BAE7E1ACE1AB900DF0C29 /* sc-153-backupslicekeybag.c */; };
                E7217B2715F8131A00D26031 /* SOSCloudKeychainConstants.c in Sources */ = {isa = PBXBuildFile; fileRef = E7217B2515F8131A00D26031 /* SOSCloudKeychainConstants.c */; };
                E7217B2815F8131A00D26031 /* SOSCloudKeychainConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = E7217B2615F8131A00D26031 /* SOSCloudKeychainConstants.h */; settings = {ATTRIBUTES = (); }; };
                E71BAE7F1ACE1AB900DF0C29 /* sc-153-backupslicekeybag.c in Sources */ = {isa = PBXBuildFile; fileRef = E71BAE7E1ACE1AB900DF0C29 /* sc-153-backupslicekeybag.c */; };
                E7217B2715F8131A00D26031 /* SOSCloudKeychainConstants.c in Sources */ = {isa = PBXBuildFile; fileRef = E7217B2515F8131A00D26031 /* SOSCloudKeychainConstants.c */; };
                E7217B2815F8131A00D26031 /* SOSCloudKeychainConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = E7217B2615F8131A00D26031 /* SOSCloudKeychainConstants.h */; settings = {ATTRIBUTES = (); }; };
-               E7285C971AE1E47D00AD412D /* SOSEngine.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C9DC91C15B602910036D941 /* SOSEngine.c */; };
                E7285C981AE1E4A800AD412D /* SOSEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C9DC91915B602760036D941 /* SOSEngine.h */; };
                E7285C981AE1E4A800AD412D /* SOSEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C9DC91915B602760036D941 /* SOSEngine.h */; };
-               E7285CAC1AE1E4DF00AD412D /* SOSChangeTracker.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C31C3CB1A9E5CDA009098D8 /* SOSChangeTracker.c */; };
                E7285CAD1AE1E4DF00AD412D /* SOSChangeTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C31C3CC1A9E5CDA009098D8 /* SOSChangeTracker.h */; };
                E7285CAD1AE1E4DF00AD412D /* SOSChangeTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C31C3CC1A9E5CDA009098D8 /* SOSChangeTracker.h */; };
+               E738B71A1D11D88C0099E5C5 /* SOSAccount.c in Sources */ = {isa = PBXBuildFile; fileRef = 4CC929AD15A3957800C6D578 /* SOSAccount.c */; };
+               E738B71B1D11D88C0099E5C5 /* SOSAccountTransaction.c in Sources */ = {isa = PBXBuildFile; fileRef = 48FD04F11CEFCFB900BEBBFF /* SOSAccountTransaction.c */; };
+               E738B71C1D11D88C0099E5C5 /* SOSAccountBackup.c in Sources */ = {isa = PBXBuildFile; fileRef = E7C4F5451AD75EBE000B5862 /* SOSAccountBackup.c */; };
+               E738B71D1D11D88C0099E5C5 /* SOSAccountCircles.c in Sources */ = {isa = PBXBuildFile; fileRef = 48764AF417FA3FE50005C4F1 /* SOSAccountCircles.c */; };
+               E738B71E1D11D88C0099E5C5 /* SOSAccountHSAJoin.c in Sources */ = {isa = PBXBuildFile; fileRef = 48FABEDB1AD05C1D00C061D1 /* SOSAccountHSAJoin.c */; };
+               E738B71F1D11D88C0099E5C5 /* SOSAccountCloudParameters.c in Sources */ = {isa = PBXBuildFile; fileRef = 48C7DF9917FF44EF00904F1A /* SOSAccountCloudParameters.c */; };
+               E738B7201D11D88C0099E5C5 /* SOSAccountCredentials.c in Sources */ = {isa = PBXBuildFile; fileRef = 48C7DF9217FF2DB500904F1A /* SOSAccountCredentials.c */; };
+               E738B7211D11D88C0099E5C5 /* SOSAccountDer.c in Sources */ = {isa = PBXBuildFile; fileRef = 48764AE717FA2DD00005C4F1 /* SOSAccountDer.c */; };
+               E738B7221D11D88C0099E5C5 /* SOSAccountFullPeerInfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 48C7DF9717FF360F00904F1A /* SOSAccountFullPeerInfo.c */; };
+               E738B7231D11D88C0099E5C5 /* SOSAccountPeers.c in Sources */ = {isa = PBXBuildFile; fileRef = 48C7DF9517FF351A00904F1A /* SOSAccountPeers.c */; };
+               E738B7241D11D88C0099E5C5 /* SOSAccountPersistence.c in Sources */ = {isa = PBXBuildFile; fileRef = 48764AEB17FA31E50005C4F1 /* SOSAccountPersistence.c */; };
+               E738B7251D11D88C0099E5C5 /* SOSAccountLog.c in Sources */ = {isa = PBXBuildFile; fileRef = 48122CC71CFF88DC009BE3E3 /* SOSAccountLog.c */; };
+               E738B7261D11D88C0099E5C5 /* SOSAccountUpdate.c in Sources */ = {isa = PBXBuildFile; fileRef = 48764AEE17FA36200005C4F1 /* SOSAccountUpdate.c */; };
+               E738B7271D11D88C0099E5C5 /* SOSAccountRings.c in Sources */ = {isa = PBXBuildFile; fileRef = CDC0DC941AE842640020BA6C /* SOSAccountRings.c */; };
+               E738B7281D11D88C0099E5C5 /* SOSAccountRingUpdate.c in Sources */ = {isa = PBXBuildFile; fileRef = CDC0DC951AE842640020BA6C /* SOSAccountRingUpdate.c */; };
+               E738B72A1D11D88C0099E5C5 /* SOSBackupEvent.c in Sources */ = {isa = PBXBuildFile; fileRef = 528462991AE6FCF0004C1BA2 /* SOSBackupEvent.c */; };
+               E738B72B1D11D88C0099E5C5 /* SOSBackupSliceKeyBag.c in Sources */ = {isa = PBXBuildFile; fileRef = E71BAE801ACE1C6500DF0C29 /* SOSBackupSliceKeyBag.c */; };
+               E738B72C1D11D88C0099E5C5 /* SOSUserKeygen.c in Sources */ = {isa = PBXBuildFile; fileRef = 4802A59516D711060059E5B9 /* SOSUserKeygen.c */; };
+               E738B72F1D11D9760099E5C5 /* SOSChangeTracker.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C31C3CB1A9E5CDA009098D8 /* SOSChangeTracker.c */; };
+               E738B7301D11D9840099E5C5 /* SOSEngine.c in Sources */ = {isa = PBXBuildFile; fileRef = 4C9DC91C15B602910036D941 /* SOSEngine.c */; };
+               E738B7321D11DAB70099E5C5 /* SOSAccountViewSync.c in Sources */ = {isa = PBXBuildFile; fileRef = E75320EB1D0B83FC00DAB140 /* SOSAccountViewSync.c */; };
+               E739A9DB1D3078D9003C088A /* NSFileHandle+Formatting.m in Sources */ = {isa = PBXBuildFile; fileRef = E739A9DA1D3078D9003C088A /* NSFileHandle+Formatting.m */; };
                E748744515A61AF800624935 /* si-68-secmatchissuer.c in Sources */ = {isa = PBXBuildFile; fileRef = E748744415A61AF800624935 /* si-68-secmatchissuer.c */; };
                E748744515A61AF800624935 /* si-68-secmatchissuer.c in Sources */ = {isa = PBXBuildFile; fileRef = E748744415A61AF800624935 /* si-68-secmatchissuer.c */; };
-               E75216AD1AF1F26500DDA573 /* SOSForerunnerSession.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BD2F7FB1ADCDD8C0037CD5D /* SOSForerunnerSession.c */; };
-               E75216AE1AF1F26500DDA573 /* SOSForerunnerSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD2F7FC1ADCDD8C0037CD5D /* SOSForerunnerSession.h */; };
                E75AB91B1AE9964800C5EF3F /* secd-40-cc-gestalt.c in Sources */ = {isa = PBXBuildFile; fileRef = E75AB9191AE9958300C5EF3F /* secd-40-cc-gestalt.c */; };
                E76079C11951FD2800F69731 /* SecLogging.c in Sources */ = {isa = PBXBuildFile; fileRef = E795C94119116EA200FA068C /* SecLogging.c */; };
                E763D6231624E2670038477D /* sc-20-keynames.c in Sources */ = {isa = PBXBuildFile; fileRef = E763D6221624E2670038477D /* sc-20-keynames.c */; };
                E75AB91B1AE9964800C5EF3F /* secd-40-cc-gestalt.c in Sources */ = {isa = PBXBuildFile; fileRef = E75AB9191AE9958300C5EF3F /* secd-40-cc-gestalt.c */; };
                E76079C11951FD2800F69731 /* SecLogging.c in Sources */ = {isa = PBXBuildFile; fileRef = E795C94119116EA200FA068C /* SecLogging.c */; };
                E763D6231624E2670038477D /* sc-20-keynames.c in Sources */ = {isa = PBXBuildFile; fileRef = E763D6221624E2670038477D /* sc-20-keynames.c */; };
@@ -441,6 +458,8 @@
                E77DE60B1C2882EC005259C2 /* si-17-item-system-bluetooth.m in Sources */ = {isa = PBXBuildFile; fileRef = E7EF51911C24C6E3002D0C23 /* si-17-item-system-bluetooth.m */; };
                E7850ED01BB30E80002A54CA /* secd-63-account-resurrection.c in Sources */ = {isa = PBXBuildFile; fileRef = E731829F1B1FC9CD00FC334C /* secd-63-account-resurrection.c */; };
                E7850ED11BB30E87002A54CA /* secd-65-account-retirement-reset.c in Sources */ = {isa = PBXBuildFile; fileRef = E7850ECE1BB30E6E002A54CA /* secd-65-account-retirement-reset.c */; };
                E77DE60B1C2882EC005259C2 /* si-17-item-system-bluetooth.m in Sources */ = {isa = PBXBuildFile; fileRef = E7EF51911C24C6E3002D0C23 /* si-17-item-system-bluetooth.m */; };
                E7850ED01BB30E80002A54CA /* secd-63-account-resurrection.c in Sources */ = {isa = PBXBuildFile; fileRef = E731829F1B1FC9CD00FC334C /* secd-63-account-resurrection.c */; };
                E7850ED11BB30E87002A54CA /* secd-65-account-retirement-reset.c in Sources */ = {isa = PBXBuildFile; fileRef = E7850ECE1BB30E6E002A54CA /* secd-65-account-retirement-reset.c */; };
+               E78A9AB21D34263100006B5B /* secd-130-other-peer-views.c in Sources */ = {isa = PBXBuildFile; fileRef = E739A9DC1D318FA4003C088A /* secd-130-other-peer-views.c */; };
+               E78A9AB31D34630300006B5B /* secd-95-escrow-persistence.c in Sources */ = {isa = PBXBuildFile; fileRef = CD8F442C1B83C435004C0047 /* secd-95-escrow-persistence.c */; };
                E790C110169E53DF00E0C0C9 /* leaks.c in Sources */ = {isa = PBXBuildFile; fileRef = E790C10E169E53DF00E0C0C9 /* leaks.c */; };
                E790C141169E5C6200E0C0C9 /* add_internet_password.c in Sources */ = {isa = PBXBuildFile; fileRef = E790C136169E5C6200E0C0C9 /* add_internet_password.c */; };
                E790C142169E5C6200E0C0C9 /* codesign.c in Sources */ = {isa = PBXBuildFile; fileRef = E790C137169E5C6200E0C0C9 /* codesign.c */; };
                E790C110169E53DF00E0C0C9 /* leaks.c in Sources */ = {isa = PBXBuildFile; fileRef = E790C10E169E53DF00E0C0C9 /* leaks.c */; };
                E790C141169E5C6200E0C0C9 /* add_internet_password.c in Sources */ = {isa = PBXBuildFile; fileRef = E790C136169E5C6200E0C0C9 /* add_internet_password.c */; };
                E790C142169E5C6200E0C0C9 /* codesign.c in Sources */ = {isa = PBXBuildFile; fileRef = E790C137169E5C6200E0C0C9 /* codesign.c */; };
@@ -462,6 +481,7 @@
                E7A10FAC1771246A00C4602F /* secd-55-account-circle.c in Sources */ = {isa = PBXBuildFile; fileRef = E7A10FAB1771246A00C4602F /* secd-55-account-circle.c */; };
                E7A10FAE1771249C00C4602F /* secd-57-account-leave.c in Sources */ = {isa = PBXBuildFile; fileRef = E7A10FAD1771249C00C4602F /* secd-57-account-leave.c */; };
                E7A634E317FA471500920B67 /* SOSPeerInfoCollections.c in Sources */ = {isa = PBXBuildFile; fileRef = E7A634E217FA471500920B67 /* SOSPeerInfoCollections.c */; };
                E7A10FAC1771246A00C4602F /* secd-55-account-circle.c in Sources */ = {isa = PBXBuildFile; fileRef = E7A10FAB1771246A00C4602F /* secd-55-account-circle.c */; };
                E7A10FAE1771249C00C4602F /* secd-57-account-leave.c in Sources */ = {isa = PBXBuildFile; fileRef = E7A10FAD1771249C00C4602F /* secd-57-account-leave.c */; };
                E7A634E317FA471500920B67 /* SOSPeerInfoCollections.c in Sources */ = {isa = PBXBuildFile; fileRef = E7A634E217FA471500920B67 /* SOSPeerInfoCollections.c */; };
+               E7ACD2FB1D30204E0038050D /* keychain_sync_test.m in Sources */ = {isa = PBXBuildFile; fileRef = E7ACD2F91D30204E0038050D /* keychain_sync_test.m */; };
                E7B01B5B16532507000485F1 /* SOSCloudCircleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = E7B01B5A16532507000485F1 /* SOSCloudCircleInternal.h */; settings = {ATTRIBUTES = (); }; };
                E7B01B691655DF20000485F1 /* SOSCloudCircleServer.c in Sources */ = {isa = PBXBuildFile; fileRef = E7B01B671655CCA6000485F1 /* SOSCloudCircleServer.c */; };
                E7CA197A17179EC20065299C /* si-69-keydesc.c in Sources */ = {isa = PBXBuildFile; fileRef = CDA7729616B899F10069434D /* si-69-keydesc.c */; };
                E7B01B5B16532507000485F1 /* SOSCloudCircleInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = E7B01B5A16532507000485F1 /* SOSCloudCircleInternal.h */; settings = {ATTRIBUTES = (); }; };
                E7B01B691655DF20000485F1 /* SOSCloudCircleServer.c in Sources */ = {isa = PBXBuildFile; fileRef = E7B01B671655CCA6000485F1 /* SOSCloudCircleServer.c */; };
                E7CA197A17179EC20065299C /* si-69-keydesc.c in Sources */ = {isa = PBXBuildFile; fileRef = CDA7729616B899F10069434D /* si-69-keydesc.c */; };
@@ -472,41 +492,24 @@
                E7FEFB87169E363300E18152 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 521C0B9815FA5C4A00604B61 /* Foundation.framework */; };
                E7FEFB91169E36D800E18152 /* keychain_sync.c in Sources */ = {isa = PBXBuildFile; fileRef = E7FEFB90169E36D800E18152 /* keychain_sync.c */; };
                EB3409AF1C1D5BBE00D77661 /* secd-20-keychain_upgrade.m in Sources */ = {isa = PBXBuildFile; fileRef = EB3409AE1C1D5BB300D77661 /* secd-20-keychain_upgrade.m */; };
                E7FEFB87169E363300E18152 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 521C0B9815FA5C4A00604B61 /* Foundation.framework */; };
                E7FEFB91169E36D800E18152 /* keychain_sync.c in Sources */ = {isa = PBXBuildFile; fileRef = E7FEFB90169E36D800E18152 /* keychain_sync.c */; };
                EB3409AF1C1D5BBE00D77661 /* secd-20-keychain_upgrade.m in Sources */ = {isa = PBXBuildFile; fileRef = EB3409AE1C1D5BB300D77661 /* secd-20-keychain_upgrade.m */; };
+               EB6432BD1C510A6E00B671F2 /* SecDigest.c in Sources */ = {isa = PBXBuildFile; fileRef = EB6432BC1C510A6E00B671F2 /* SecDigest.c */; };
+               EB6432BE1C510A6E00B671F2 /* SecDigest.c in Sources */ = {isa = PBXBuildFile; fileRef = EB6432BC1C510A6E00B671F2 /* SecDigest.c */; };
                EB69AB041BF3C42F00913AF1 /* SecEMCS.m in Sources */ = {isa = PBXBuildFile; fileRef = EB69AB031BF3C42F00913AF1 /* SecEMCS.m */; };
                EB69AB061BF425FD00913AF1 /* si-90-emcs.m in Sources */ = {isa = PBXBuildFile; fileRef = EB69AB051BF425F300913AF1 /* si-90-emcs.m */; };
                EB69AB071BF4332700913AF1 /* si-90-emcs.m in Sources */ = {isa = PBXBuildFile; fileRef = EB69AB051BF425F300913AF1 /* si-90-emcs.m */; };
                EB69AB041BF3C42F00913AF1 /* SecEMCS.m in Sources */ = {isa = PBXBuildFile; fileRef = EB69AB031BF3C42F00913AF1 /* SecEMCS.m */; };
                EB69AB061BF425FD00913AF1 /* si-90-emcs.m in Sources */ = {isa = PBXBuildFile; fileRef = EB69AB051BF425F300913AF1 /* si-90-emcs.m */; };
                EB69AB071BF4332700913AF1 /* si-90-emcs.m in Sources */ = {isa = PBXBuildFile; fileRef = EB69AB051BF425F300913AF1 /* si-90-emcs.m */; };
-               EB8F48DD1AE4CC7000CE93A7 /* si-25-sectrust-apple-authentication.c in Sources */ = {isa = PBXBuildFile; fileRef = EB8F48DC1AE4C81400CE93A7 /* si-25-sectrust-apple-authentication.c */; };
                EB9C1D0A1BDDBDE000F89272 /* si-13-item-system.m in Sources */ = {isa = PBXBuildFile; fileRef = EB9C1D091BDDBDD500F89272 /* si-13-item-system.m */; };
                EBC1B8B81BE96B3A00E6ACA6 /* digest_calc.c in Sources */ = {isa = PBXBuildFile; fileRef = E790C109169E4FD200E0C0C9 /* digest_calc.c */; };
                EBC1B8B91BE96B3A00E6ACA6 /* whoami.m in Sources */ = {isa = PBXBuildFile; fileRef = EBC1B8B61BE96B3200E6ACA6 /* whoami.m */; };
                EB9C1D0A1BDDBDE000F89272 /* si-13-item-system.m in Sources */ = {isa = PBXBuildFile; fileRef = EB9C1D091BDDBDD500F89272 /* si-13-item-system.m */; };
                EBC1B8B81BE96B3A00E6ACA6 /* digest_calc.c in Sources */ = {isa = PBXBuildFile; fileRef = E790C109169E4FD200E0C0C9 /* digest_calc.c */; };
                EBC1B8B91BE96B3A00E6ACA6 /* whoami.m in Sources */ = {isa = PBXBuildFile; fileRef = EBC1B8B61BE96B3200E6ACA6 /* whoami.m */; };
+               EBD344801D234E37008B6DEA /* si-15-delete-access-group.m in Sources */ = {isa = PBXBuildFile; fileRef = EBD3447F1D234E26008B6DEA /* si-15-delete-access-group.m */; };
                EBDAECBC184D32BD005A18F1 /* sc-31-peerinfo-simplefuzz.c in Sources */ = {isa = PBXBuildFile; fileRef = EBDAECBA184D30C3005A18F1 /* sc-31-peerinfo-simplefuzz.c */; };
                EBE32B591BEEC8C900719AA8 /* syncbubble.m in Sources */ = {isa = PBXBuildFile; fileRef = EBE32B581BEEC8C900719AA8 /* syncbubble.m */; };
                EBF2D7661C1E482B006AB6FF /* secd-21-transmogrify.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF2D7651C1E4823006AB6FF /* secd-21-transmogrify.m */; };
                F697632318F6CFD60090438B /* keychain_util.c in Sources */ = {isa = PBXBuildFile; fileRef = F697632118F6CC3F0090438B /* keychain_util.c */; };
                EBDAECBC184D32BD005A18F1 /* sc-31-peerinfo-simplefuzz.c in Sources */ = {isa = PBXBuildFile; fileRef = EBDAECBA184D30C3005A18F1 /* sc-31-peerinfo-simplefuzz.c */; };
                EBE32B591BEEC8C900719AA8 /* syncbubble.m in Sources */ = {isa = PBXBuildFile; fileRef = EBE32B581BEEC8C900719AA8 /* syncbubble.m */; };
                EBF2D7661C1E482B006AB6FF /* secd-21-transmogrify.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF2D7651C1E4823006AB6FF /* secd-21-transmogrify.m */; };
                F697632318F6CFD60090438B /* keychain_util.c in Sources */ = {isa = PBXBuildFile; fileRef = F697632118F6CC3F0090438B /* keychain_util.c */; };
-               F953A6A91B43597D006EC5E1 /* si-81-sectrust-appletv.c in Sources */ = {isa = PBXBuildFile; fileRef = F953A6A71B43538A006EC5E1 /* si-81-sectrust-appletv.c */; };
                F9E0BD991AEF196E00554D49 /* secd-82-persistent-ref.c in Sources */ = {isa = PBXBuildFile; fileRef = F9E0BD981AEF196A00554D49 /* secd-82-persistent-ref.c */; };
                F9EF72F21AC0F98400A4D24A /* secd-70-engine-smash.c in Sources */ = {isa = PBXBuildFile; fileRef = F9EF72F01AC0F97C00A4D24A /* secd-70-engine-smash.c */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
                F9E0BD991AEF196E00554D49 /* secd-82-persistent-ref.c in Sources */ = {isa = PBXBuildFile; fileRef = F9E0BD981AEF196A00554D49 /* secd-82-persistent-ref.c */; };
                F9EF72F21AC0F98400A4D24A /* secd-70-engine-smash.c in Sources */ = {isa = PBXBuildFile; fileRef = F9EF72F01AC0F97C00A4D24A /* secd-70-engine-smash.c */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-               5284029E164445760035F320 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = "include/${PRODUCT_NAME}";
-                       dstSubfolderSpec = 16;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               CD3F91491A802EBF00E07119 /* CopyFiles */ = {
-                       isa = PBXCopyFilesBuildPhase;
-                       buildActionMask = 2147483647;
-                       dstPath = "include/$(PRODUCT_NAME)";
-                       dstSubfolderSpec = 16;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                E71049F0169E023B00DB0045 /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 2147483647;
                E71049F0169E023B00DB0045 /* CopyFiles */ = {
                        isa = PBXCopyFilesBuildPhase;
                        buildActionMask = 2147483647;
@@ -537,12 +540,19 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+               093F67A21CC1171B0033151D /* SecKeyAdaptors.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecKeyAdaptors.c; sourceTree = "<group>"; };
+               0982E02B1D19695B0060002E /* si-44-seckey-ec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "si-44-seckey-ec.m"; path = "../../../../shared_regressions/si-44-seckey-ec.m"; sourceTree = "<group>"; };
+               09AE116D1CEDA17A004C617D /* si-44-seckey-ies.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "si-44-seckey-ies.m"; path = "../../../../shared_regressions/si-44-seckey-ies.m"; sourceTree = "<group>"; };
+               09D1FC1D1CDCBA8800A82D0D /* si-44-seckey-gen.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "si-44-seckey-gen.m"; path = "../../../../shared_regressions/si-44-seckey-gen.m"; sourceTree = "<group>"; };
+               09EC947E1CEDEA70003E5101 /* si-44-seckey-rsa.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "si-44-seckey-rsa.m"; path = "../../../../shared_regressions/si-44-seckey-rsa.m"; sourceTree = "<group>"; };
                0C062B1C175E784B00806CFE /* secd-30-keychain-upgrade.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-30-keychain-upgrade.c"; sourceTree = "<group>"; };
                0C062B1D175E784B00806CFE /* secd-31-keychain-bad.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-31-keychain-bad.c"; sourceTree = "<group>"; };
                0C062B1E175E784B00806CFE /* secd-31-keychain-unreadable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-31-keychain-unreadable.c"; sourceTree = "<group>"; };
                0C0BDB5F175687EC00BC1A7E /* libsecdRegressions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsecdRegressions.a; sourceTree = BUILT_PRODUCTS_DIR; };
                0C0BDB601756882A00BC1A7E /* secd_regressions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = secd_regressions.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
                0C0BDB62175688DA00BC1A7E /* secd-01-items.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-01-items.c"; sourceTree = "<group>"; };
                0C062B1C175E784B00806CFE /* secd-30-keychain-upgrade.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-30-keychain-upgrade.c"; sourceTree = "<group>"; };
                0C062B1D175E784B00806CFE /* secd-31-keychain-bad.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-31-keychain-bad.c"; sourceTree = "<group>"; };
                0C062B1E175E784B00806CFE /* secd-31-keychain-unreadable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-31-keychain-unreadable.c"; sourceTree = "<group>"; };
                0C0BDB5F175687EC00BC1A7E /* libsecdRegressions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsecdRegressions.a; sourceTree = BUILT_PRODUCTS_DIR; };
                0C0BDB601756882A00BC1A7E /* secd_regressions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = secd_regressions.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
                0C0BDB62175688DA00BC1A7E /* secd-01-items.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-01-items.c"; sourceTree = "<group>"; };
+               0C3276C21CB329AB005D6DDC /* secd_77_ids_messaging.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = secd_77_ids_messaging.c; sourceTree = "<group>"; };
+               0C60F39B1CAF0E8E00221D24 /* secd-76-idstransport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-76-idstransport.c"; sourceTree = "<group>"; };
                0C664AE7175951270092D3D9 /* secd-02-upgrade-while-locked.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = "secd-02-upgrade-while-locked.c"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
                0CBF93F5177B7CFC001E5658 /* secd-03-corrupted-items.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-03-corrupted-items.c"; sourceTree = "<group>"; };
                0CBF93F6177B7CFC001E5658 /* secd-04-corrupted-items.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-04-corrupted-items.c"; sourceTree = "<group>"; };
                0C664AE7175951270092D3D9 /* secd-02-upgrade-while-locked.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = "secd-02-upgrade-while-locked.c"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
                0CBF93F5177B7CFC001E5658 /* secd-03-corrupted-items.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-03-corrupted-items.c"; sourceTree = "<group>"; };
                0CBF93F6177B7CFC001E5658 /* secd-04-corrupted-items.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-04-corrupted-items.c"; sourceTree = "<group>"; };
@@ -633,7 +643,7 @@
                18AD565E14CB6F79008233F2 /* SecOCSPResponse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecOCSPResponse.h; sourceTree = "<group>"; };
                18AD565F14CB6F79008233F2 /* SecPolicyServer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SecPolicyServer.c; sourceTree = "<group>"; };
                18AD566014CB6F79008233F2 /* SecPolicyServer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecPolicyServer.h; sourceTree = "<group>"; };
                18AD565E14CB6F79008233F2 /* SecOCSPResponse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecOCSPResponse.h; sourceTree = "<group>"; };
                18AD565F14CB6F79008233F2 /* SecPolicyServer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SecPolicyServer.c; sourceTree = "<group>"; };
                18AD566014CB6F79008233F2 /* SecPolicyServer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecPolicyServer.h; sourceTree = "<group>"; };
-               18AD566114CB6F79008233F2 /* SecTrustServer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SecTrustServer.c; sourceTree = "<group>"; };
+               18AD566114CB6F79008233F2 /* SecTrustServer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = SecTrustServer.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
                18AD566214CB6F79008233F2 /* SecTrustServer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecTrustServer.h; sourceTree = "<group>"; };
                18AD566314CB6F79008233F2 /* SecTrustStoreServer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SecTrustStoreServer.c; sourceTree = "<group>"; };
                18AD566414CB6F79008233F2 /* SecTrustStoreServer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecTrustStoreServer.h; sourceTree = "<group>"; };
                18AD566214CB6F79008233F2 /* SecTrustServer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecTrustServer.h; sourceTree = "<group>"; };
                18AD566314CB6F79008233F2 /* SecTrustStoreServer.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SecTrustStoreServer.c; sourceTree = "<group>"; };
                18AD566414CB6F79008233F2 /* SecTrustStoreServer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecTrustStoreServer.h; sourceTree = "<group>"; };
@@ -655,7 +665,9 @@
                32FBBBE61B556F8900AEF9ED /* verify_cert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = verify_cert.c; sourceTree = "<group>"; };
                3A70988118CDF648009FD2CC /* si_77_SecAccessControl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = si_77_SecAccessControl.c; sourceTree = "<group>"; };
                4406660E19069707000DA171 /* si-80-empty-data.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "si-80-empty-data.c"; sourceTree = "<group>"; };
                32FBBBE61B556F8900AEF9ED /* verify_cert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = verify_cert.c; sourceTree = "<group>"; };
                3A70988118CDF648009FD2CC /* si_77_SecAccessControl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = si_77_SecAccessControl.c; sourceTree = "<group>"; };
                4406660E19069707000DA171 /* si-80-empty-data.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "si-80-empty-data.c"; sourceTree = "<group>"; };
-               4469FC2A1AA0A69E0021AA26 /* secd-33-keychain-ctk.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "secd-33-keychain-ctk.c"; sourceTree = "<group>"; };
+               440BF8F41A7A7EC9001760A7 /* si-82-token-ag.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-82-token-ag.c"; sourceTree = "<group>"; };
+               442B69241BC3C5B9000F3A72 /* SecItemShim.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecItemShim.h; sourceTree = "<group>"; };
+               4469FC2A1AA0A69E0021AA26 /* secd-33-keychain-ctk.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "secd-33-keychain-ctk.m"; sourceTree = "<group>"; };
                446CEEE319B6043900ECAF50 /* secd-32-restore-bad-backup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-32-restore-bad-backup.c"; sourceTree = "<group>"; };
                4477A8D718F28AAE00B5BB9F /* si-78-query-attrs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-78-query-attrs.c"; sourceTree = "<group>"; };
                4483050D1B46FB6C00326450 /* secd-35-keychain-migrate-inet.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-35-keychain-migrate-inet.c"; sourceTree = "<group>"; };
                446CEEE319B6043900ECAF50 /* secd-32-restore-bad-backup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-32-restore-bad-backup.c"; sourceTree = "<group>"; };
                4477A8D718F28AAE00B5BB9F /* si-78-query-attrs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-78-query-attrs.c"; sourceTree = "<group>"; };
                4483050D1B46FB6C00326450 /* secd-35-keychain-migrate-inet.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-35-keychain-migrate-inet.c"; sourceTree = "<group>"; };
@@ -665,14 +677,25 @@
                44B2606C18F82631008DF20F /* SecAccessControlExports.exp-in */ = {isa = PBXFileReference; lastKnownFileType = text; path = "SecAccessControlExports.exp-in"; sourceTree = "<group>"; };
                4802A59516D711060059E5B9 /* SOSUserKeygen.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSUserKeygen.c; sourceTree = "<group>"; };
                4802A59716D711190059E5B9 /* SOSUserKeygen.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSUserKeygen.h; sourceTree = "<group>"; };
                44B2606C18F82631008DF20F /* SecAccessControlExports.exp-in */ = {isa = PBXFileReference; lastKnownFileType = text; path = "SecAccessControlExports.exp-in"; sourceTree = "<group>"; };
                4802A59516D711060059E5B9 /* SOSUserKeygen.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSUserKeygen.c; sourceTree = "<group>"; };
                4802A59716D711190059E5B9 /* SOSUserKeygen.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSUserKeygen.h; sourceTree = "<group>"; };
+               48122CC71CFF88DC009BE3E3 /* SOSAccountLog.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SOSAccountLog.c; sourceTree = "<group>"; };
+               48122CC81CFF88DC009BE3E3 /* SOSAccountLog.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSAccountLog.h; sourceTree = "<group>"; };
+               4812D5A51CAF07060041FAD8 /* SOSViews.exp-in */ = {isa = PBXFileReference; lastKnownFileType = text; path = "SOSViews.exp-in"; sourceTree = "<group>"; };
+               4812D5A61CAF1FCB0041FAD8 /* ViewList.list */ = {isa = PBXFileReference; lastKnownFileType = text; path = ViewList.list; sourceTree = "<group>"; };
+               481A954F1D1A02AA000B98F5 /* SOSCloudKeychainLogging.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSCloudKeychainLogging.c; sourceTree = "<group>"; };
+               481A95501D1A02AA000B98F5 /* SOSCloudKeychainLogging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSCloudKeychainLogging.h; sourceTree = "<group>"; };
+               4826374C1CC18A410082C9C8 /* secd-57-1-account-last-standing.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-57-1-account-last-standing.c"; sourceTree = "<group>"; };
                48279BC31C57FEA20043457C /* keychain_log.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = keychain_log.c; sourceTree = "<group>"; };
                48279BC41C57FEA20043457C /* keychain_log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keychain_log.h; sourceTree = "<group>"; };
                48279BC31C57FEA20043457C /* keychain_log.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = keychain_log.c; sourceTree = "<group>"; };
                48279BC41C57FEA20043457C /* keychain_log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keychain_log.h; sourceTree = "<group>"; };
+               4838F6BB1CB5AA5F009E8598 /* secViewDisplay.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = secViewDisplay.c; sourceTree = "<group>"; };
+               4838F6BC1CB5AA5F009E8598 /* secViewDisplay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = secViewDisplay.h; sourceTree = "<group>"; };
                484182601A30F2E300211511 /* SOSCirclePriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSCirclePriv.h; sourceTree = "<group>"; };
                484182621A30F38E00211511 /* SOSCircleRings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSCircleRings.h; sourceTree = "<group>"; };
                484182631A30F8D300211511 /* SOSPeerInfoPriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSPeerInfoPriv.h; sourceTree = "<group>"; };
                48487D271B1D5E960078C7C9 /* sc-25-soskeygen.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sc-25-soskeygen.c"; sourceTree = "<group>"; };
                485835871779013E0050F074 /* SOSPeerInfoInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSPeerInfoInternal.h; sourceTree = "<group>"; };
                485B5E611AE068D800A3C183 /* secd-82-secproperties-basic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-82-secproperties-basic.c"; sourceTree = "<group>"; };
                484182601A30F2E300211511 /* SOSCirclePriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSCirclePriv.h; sourceTree = "<group>"; };
                484182621A30F38E00211511 /* SOSCircleRings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSCircleRings.h; sourceTree = "<group>"; };
                484182631A30F8D300211511 /* SOSPeerInfoPriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSPeerInfoPriv.h; sourceTree = "<group>"; };
                48487D271B1D5E960078C7C9 /* sc-25-soskeygen.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sc-25-soskeygen.c"; sourceTree = "<group>"; };
                485835871779013E0050F074 /* SOSPeerInfoInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSPeerInfoInternal.h; sourceTree = "<group>"; };
                485B5E611AE068D800A3C183 /* secd-82-secproperties-basic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-82-secproperties-basic.c"; sourceTree = "<group>"; };
+               485FE6BC1CDBED5800C916C5 /* syncbackup.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = syncbackup.c; sourceTree = "<group>"; };
+               485FE6BD1CDBED5800C916C5 /* syncbackup.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = syncbackup.h; sourceTree = "<group>"; };
                486C6C671795F20E00387075 /* secd-61-account-leave-not-in-kansas-anymore.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-61-account-leave-not-in-kansas-anymore.c"; sourceTree = "<group>"; };
                48764AE717FA2DD00005C4F1 /* SOSAccountDer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSAccountDer.c; sourceTree = "<group>"; };
                48764AEA17FA31670005C4F1 /* SOSAccountPriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSAccountPriv.h; sourceTree = "<group>"; };
                486C6C671795F20E00387075 /* secd-61-account-leave-not-in-kansas-anymore.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-61-account-leave-not-in-kansas-anymore.c"; sourceTree = "<group>"; };
                48764AE717FA2DD00005C4F1 /* SOSAccountDer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSAccountDer.c; sourceTree = "<group>"; };
                48764AEA17FA31670005C4F1 /* SOSAccountPriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSAccountPriv.h; sourceTree = "<group>"; };
@@ -685,6 +708,8 @@
                488902EB16C2F88400F119FF /* SOSCoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSCoder.c; sourceTree = "<group>"; };
                488902ED16C2F89700F119FF /* SOSCoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSCoder.h; sourceTree = "<group>"; };
                4898223917BDB277003BEF32 /* secd-52-account-changed.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-52-account-changed.c"; sourceTree = "<group>"; };
                488902EB16C2F88400F119FF /* SOSCoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSCoder.c; sourceTree = "<group>"; };
                488902ED16C2F89700F119FF /* SOSCoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSCoder.h; sourceTree = "<group>"; };
                4898223917BDB277003BEF32 /* secd-52-account-changed.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-52-account-changed.c"; sourceTree = "<group>"; };
+               4899F2E71C768BBE00762615 /* secToolFileIO.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = secToolFileIO.c; sourceTree = "<group>"; };
+               4899F2E81C768BBE00762615 /* secToolFileIO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = secToolFileIO.h; sourceTree = "<group>"; };
                489E6E4A1A71A87600D7EB8C /* SOSCircleDer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSCircleDer.c; sourceTree = "<group>"; };
                489E6E4B1A71A87600D7EB8C /* SOSCircleDer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSCircleDer.h; sourceTree = "<group>"; };
                489EA3C11AEAE659004A6AEB /* SOSRingBackup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSRingBackup.c; sourceTree = "<group>"; };
                489E6E4A1A71A87600D7EB8C /* SOSCircleDer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSCircleDer.c; sourceTree = "<group>"; };
                489E6E4B1A71A87600D7EB8C /* SOSCircleDer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSCircleDer.h; sourceTree = "<group>"; };
                489EA3C11AEAE659004A6AEB /* SOSRingBackup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSRingBackup.c; sourceTree = "<group>"; };
@@ -692,6 +717,7 @@
                48A071CD1AD6AEA900728AEF /* SOSPeerInfoSecurityProperties.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSPeerInfoSecurityProperties.c; sourceTree = "<group>"; };
                48A071CE1AD6AEA900728AEF /* SOSPeerInfoSecurityProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSPeerInfoSecurityProperties.h; sourceTree = "<group>"; };
                48A0FEDD1B6046E2001D6180 /* secd-64-circlereset.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-64-circlereset.c"; sourceTree = "<group>"; };
                48A071CD1AD6AEA900728AEF /* SOSPeerInfoSecurityProperties.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSPeerInfoSecurityProperties.c; sourceTree = "<group>"; };
                48A071CE1AD6AEA900728AEF /* SOSPeerInfoSecurityProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSPeerInfoSecurityProperties.h; sourceTree = "<group>"; };
                48A0FEDD1B6046E2001D6180 /* secd-64-circlereset.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-64-circlereset.c"; sourceTree = "<group>"; };
+               48B5888B1D00ED9000E0C5A7 /* secd-200-logstate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-200-logstate.c"; sourceTree = "<group>"; };
                48C34E911C45EF3000B7F29B /* secd60-account-cloud-exposure.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd60-account-cloud-exposure.c"; sourceTree = "<group>"; };
                48C7DF9217FF2DB500904F1A /* SOSAccountCredentials.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSAccountCredentials.c; sourceTree = "<group>"; };
                48C7DF9517FF351A00904F1A /* SOSAccountPeers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSAccountPeers.c; sourceTree = "<group>"; };
                48C34E911C45EF3000B7F29B /* secd60-account-cloud-exposure.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd60-account-cloud-exposure.c"; sourceTree = "<group>"; };
                48C7DF9217FF2DB500904F1A /* SOSAccountCredentials.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSAccountCredentials.c; sourceTree = "<group>"; };
                48C7DF9517FF351A00904F1A /* SOSAccountPeers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSAccountPeers.c; sourceTree = "<group>"; };
@@ -710,8 +736,8 @@
                48FB17001A76F56C00B586C7 /* SOSPeerInfoV2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSPeerInfoV2.c; sourceTree = "<group>"; };
                48FB17011A76F56C00B586C7 /* SOSPeerInfoV2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSPeerInfoV2.h; sourceTree = "<group>"; };
                48FB17041A77181A00B586C7 /* secd-80-views-basic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-80-views-basic.c"; sourceTree = "<group>"; };
                48FB17001A76F56C00B586C7 /* SOSPeerInfoV2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSPeerInfoV2.c; sourceTree = "<group>"; };
                48FB17011A76F56C00B586C7 /* SOSPeerInfoV2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSPeerInfoV2.h; sourceTree = "<group>"; };
                48FB17041A77181A00B586C7 /* secd-80-views-basic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-80-views-basic.c"; sourceTree = "<group>"; };
-               48FEA7771C52FFE70020C148 /* secToolFileIO.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = secToolFileIO.c; sourceTree = "<group>"; };
-               48FEA7781C52FFE70020C148 /* secToolFileIO.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = secToolFileIO.h; sourceTree = "<group>"; };
+               48FD04F11CEFCFB900BEBBFF /* SOSAccountTransaction.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSAccountTransaction.c; sourceTree = "<group>"; };
+               48FD04F21CEFCFB900BEBBFF /* SOSAccountTransaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSAccountTransaction.h; sourceTree = "<group>"; };
                4A5CCA4F15ACEFA500702357 /* libSecOtrOSX.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSecOtrOSX.a; sourceTree = BUILT_PRODUCTS_DIR; };
                4A824B03158FF07000F932C0 /* libSecurityRegressions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSecurityRegressions.a; sourceTree = BUILT_PRODUCTS_DIR; };
                4A971682158FDEB800D439B7 /* SecOTR.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecOTR.h; sourceTree = "<group>"; };
                4A5CCA4F15ACEFA500702357 /* libSecOtrOSX.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSecOtrOSX.a; sourceTree = BUILT_PRODUCTS_DIR; };
                4A824B03158FF07000F932C0 /* libSecurityRegressions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSecurityRegressions.a; sourceTree = BUILT_PRODUCTS_DIR; };
                4A971682158FDEB800D439B7 /* SecOTR.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecOTR.h; sourceTree = "<group>"; };
@@ -732,8 +758,6 @@
                4A971692158FDEB800D439B7 /* SecOTRSessionAKE.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecOTRSessionAKE.c; sourceTree = "<group>"; };
                4A971693158FDEB800D439B7 /* SecOTRSessionPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecOTRSessionPriv.h; sourceTree = "<group>"; };
                4A971694158FDEB800D439B7 /* SecOTRUtils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecOTRUtils.c; sourceTree = "<group>"; };
                4A971692158FDEB800D439B7 /* SecOTRSessionAKE.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecOTRSessionAKE.c; sourceTree = "<group>"; };
                4A971693158FDEB800D439B7 /* SecOTRSessionPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecOTRSessionPriv.h; sourceTree = "<group>"; };
                4A971694158FDEB800D439B7 /* SecOTRUtils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecOTRUtils.c; sourceTree = "<group>"; };
-               4BD2F7FB1ADCDD8C0037CD5D /* SOSForerunnerSession.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSForerunnerSession.c; sourceTree = "<group>"; };
-               4BD2F7FC1ADCDD8C0037CD5D /* SOSForerunnerSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSForerunnerSession.h; sourceTree = "<group>"; };
                4BD2F7FF1ADCDEAA0037CD5D /* sc-140-hsa2.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "sc-140-hsa2.c"; sourceTree = "<group>"; };
                4BD2F8011ADCDF790037CD5D /* SOSPlatform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSPlatform.h; sourceTree = "<group>"; };
                4C055FED17B60F1E001A879A /* SecDbKeychainItem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecDbKeychainItem.c; sourceTree = "<group>"; };
                4BD2F7FF1ADCDEAA0037CD5D /* sc-140-hsa2.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "sc-140-hsa2.c"; sourceTree = "<group>"; };
                4BD2F8011ADCDF790037CD5D /* SOSPlatform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSPlatform.h; sourceTree = "<group>"; };
                4C055FED17B60F1E001A879A /* SecDbKeychainItem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecDbKeychainItem.c; sourceTree = "<group>"; };
@@ -758,7 +782,6 @@
                4C4B15951655EDA700734590 /* SecDbItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecDbItem.h; sourceTree = "<group>"; };
                4C5EA365164C791400A136B8 /* lib-arc-only.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "lib-arc-only.xcconfig"; sourceTree = "<group>"; };
                4C64F59617C6B3B1009C5AC2 /* sc-45-digestvector.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sc-45-digestvector.c"; sourceTree = "<group>"; };
                4C4B15951655EDA700734590 /* SecDbItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecDbItem.h; sourceTree = "<group>"; };
                4C5EA365164C791400A136B8 /* lib-arc-only.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "lib-arc-only.xcconfig"; sourceTree = "<group>"; };
                4C64F59617C6B3B1009C5AC2 /* sc-45-digestvector.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sc-45-digestvector.c"; sourceTree = "<group>"; };
-               4C8940DA166EA8CF00241770 /* osxshim.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = osxshim.c; sourceTree = "<group>"; };
                4C8BDD9A17B4FB8F00C20EA5 /* SOSDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSDataSource.h; sourceTree = "<group>"; };
                4C8BDD9C17B4FD2A00C20EA5 /* SOSManifest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSManifest.h; sourceTree = "<group>"; };
                4C8BDD9E17B4FDE100C20EA5 /* SOSManifest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSManifest.c; sourceTree = "<group>"; };
                4C8BDD9A17B4FB8F00C20EA5 /* SOSDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSDataSource.h; sourceTree = "<group>"; };
                4C8BDD9C17B4FD2A00C20EA5 /* SOSManifest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSManifest.h; sourceTree = "<group>"; };
                4C8BDD9E17B4FDE100C20EA5 /* SOSManifest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSManifest.c; sourceTree = "<group>"; };
@@ -790,24 +813,18 @@
                4CC92A1B15A3ABD400C6D578 /* si-14-dateparse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-14-dateparse.c"; sourceTree = "<group>"; };
                4CC92A1C15A3ABD400C6D578 /* si-15-certificate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-15-certificate.c"; sourceTree = "<group>"; };
                4CC92A1D15A3ABD400C6D578 /* si-16-ec-certificate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-16-ec-certificate.c"; sourceTree = "<group>"; };
                4CC92A1B15A3ABD400C6D578 /* si-14-dateparse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-14-dateparse.c"; sourceTree = "<group>"; };
                4CC92A1C15A3ABD400C6D578 /* si-15-certificate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-15-certificate.c"; sourceTree = "<group>"; };
                4CC92A1D15A3ABD400C6D578 /* si-16-ec-certificate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-16-ec-certificate.c"; sourceTree = "<group>"; };
-               4CC92A1E15A3ABD400C6D578 /* si-20-sectrust-activation.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-20-sectrust-activation.c"; sourceTree = "<group>"; };
                4CC92A1F15A3ABD400C6D578 /* si-20-sectrust.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-20-sectrust.c"; sourceTree = "<group>"; };
                4CC92A2015A3ABD400C6D578 /* si-21-sectrust-asr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-21-sectrust-asr.c"; sourceTree = "<group>"; };
                4CC92A2115A3ABD400C6D578 /* si-22-sectrust-iap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-22-sectrust-iap.c"; sourceTree = "<group>"; };
                4CC92A2215A3ABD400C6D578 /* si-23-sectrust-ocsp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-23-sectrust-ocsp.c"; sourceTree = "<group>"; };
                4CC92A1F15A3ABD400C6D578 /* si-20-sectrust.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-20-sectrust.c"; sourceTree = "<group>"; };
                4CC92A2015A3ABD400C6D578 /* si-21-sectrust-asr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-21-sectrust-asr.c"; sourceTree = "<group>"; };
                4CC92A2115A3ABD400C6D578 /* si-22-sectrust-iap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-22-sectrust-iap.c"; sourceTree = "<group>"; };
                4CC92A2215A3ABD400C6D578 /* si-23-sectrust-ocsp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-23-sectrust-ocsp.c"; sourceTree = "<group>"; };
-               4CC92A2315A3ABD400C6D578 /* si-24-sectrust-appleid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-24-sectrust-appleid.c"; sourceTree = "<group>"; };
                4CC92A2415A3ABD400C6D578 /* si-24-sectrust-digicert-malaysia.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-24-sectrust-digicert-malaysia.c"; sourceTree = "<group>"; };
                4CC92A2515A3ABD400C6D578 /* si-24-sectrust-diginotar.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-24-sectrust-diginotar.c"; sourceTree = "<group>"; };
                4CC92A2615A3ABD400C6D578 /* si-24-sectrust-itms.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-24-sectrust-itms.c"; sourceTree = "<group>"; };
                4CC92A2415A3ABD400C6D578 /* si-24-sectrust-digicert-malaysia.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-24-sectrust-digicert-malaysia.c"; sourceTree = "<group>"; };
                4CC92A2515A3ABD400C6D578 /* si-24-sectrust-diginotar.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-24-sectrust-diginotar.c"; sourceTree = "<group>"; };
                4CC92A2615A3ABD400C6D578 /* si-24-sectrust-itms.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-24-sectrust-itms.c"; sourceTree = "<group>"; };
-               4CC92A2715A3ABD400C6D578 /* si-24-sectrust-mobileasset.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-24-sectrust-mobileasset.c"; sourceTree = "<group>"; };
                4CC92A2815A3ABD400C6D578 /* si-24-sectrust-nist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-24-sectrust-nist.c"; sourceTree = "<group>"; };
                4CC92A2815A3ABD400C6D578 /* si-24-sectrust-nist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-24-sectrust-nist.c"; sourceTree = "<group>"; };
-               4CC92A2915A3ABD400C6D578 /* si-24-sectrust-otatasking.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-24-sectrust-otatasking.c"; sourceTree = "<group>"; };
-               4CC92A2A15A3ABD400C6D578 /* si-24-sectrust-shoebox.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-24-sectrust-shoebox.c"; sourceTree = "<group>"; };
-               4CC92A2B15A3ABD400C6D578 /* si-25-sectrust-ipsec-eap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-25-sectrust-ipsec-eap.c"; sourceTree = "<group>"; };
-               4CC92A2C15A3ABD400C6D578 /* si-26-applicationsigning.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-26-applicationsigning.c"; sourceTree = "<group>"; };
+               4CC92A2A15A3ABD400C6D578 /* si-24-sectrust-passbook.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-24-sectrust-passbook.c"; sourceTree = "<group>"; };
+               4CC92A2C15A3ABD400C6D578 /* si-26-sectrust-copyproperties.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-26-sectrust-copyproperties.c"; sourceTree = "<group>"; };
                4CC92A2D15A3ABD400C6D578 /* si-27-sectrust-exceptions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-27-sectrust-exceptions.c"; sourceTree = "<group>"; };
                4CC92A2D15A3ABD400C6D578 /* si-27-sectrust-exceptions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-27-sectrust-exceptions.c"; sourceTree = "<group>"; };
-               4CC92A2E15A3ABD400C6D578 /* si-28-sectrustsettings.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-28-sectrustsettings.c"; sourceTree = "<group>"; };
-               4CC92A2F15A3ABD400C6D578 /* si-29-sectrust-codesigning.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-29-sectrust-codesigning.c"; sourceTree = "<group>"; };
+               4CC92A2E15A3ABD400C6D578 /* si-28-sectrustsettings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "si-28-sectrustsettings.m"; sourceTree = "<group>"; };
                4CC92A3015A3ABD400C6D578 /* si-30-keychain-upgrade.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-30-keychain-upgrade.c"; sourceTree = "<group>"; };
                4CC92A3115A3ABD400C6D578 /* si-31-keychain-bad.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-31-keychain-bad.c"; sourceTree = "<group>"; };
                4CC92A3215A3ABD400C6D578 /* si-31-keychain-unreadable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-31-keychain-unreadable.c"; sourceTree = "<group>"; };
                4CC92A3015A3ABD400C6D578 /* si-30-keychain-upgrade.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-30-keychain-upgrade.c"; sourceTree = "<group>"; };
                4CC92A3115A3ABD400C6D578 /* si-31-keychain-bad.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-31-keychain-bad.c"; sourceTree = "<group>"; };
                4CC92A3215A3ABD400C6D578 /* si-31-keychain-unreadable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-31-keychain-unreadable.c"; sourceTree = "<group>"; };
@@ -858,32 +875,19 @@
                4CD1897B169F835400BC96B8 /* print_cert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = print_cert.c; sourceTree = "<group>"; };
                4CD1897C169F835400BC96B8 /* print_cert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = print_cert.h; sourceTree = "<group>"; };
                521C0B9815FA5C4A00604B61 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
                4CD1897B169F835400BC96B8 /* print_cert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = print_cert.c; sourceTree = "<group>"; };
                4CD1897C169F835400BC96B8 /* print_cert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = print_cert.h; sourceTree = "<group>"; };
                521C0B9815FA5C4A00604B61 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-               521C0BA615FA5D7400604B61 /* cloudkeychain.entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = cloudkeychain.entitlements.plist; path = SOSCircle/CloudKeychainProxy/cloudkeychain.entitlements.plist; sourceTree = SOURCE_ROOT; };
-               521C0BAD15FA5DA800604B61 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = InfoPlist.strings; sourceTree = "<group>"; };
-               521C0BAF15FA5E3F00604B61 /* CKDKVSProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = CKDKVSProxy.h; path = SOSCircle/CloudKeychainProxy/CKDKVSProxy.h; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
-               521C0BB015FA5E3F00604B61 /* CKDKVSProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CKDKVSProxy.m; path = SOSCircle/CloudKeychainProxy/CKDKVSProxy.m; sourceTree = SOURCE_ROOT; };
-               521C0BB115FA5E3F00604B61 /* CKDPersistentState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CKDPersistentState.h; path = SOSCircle/CloudKeychainProxy/CKDPersistentState.h; sourceTree = SOURCE_ROOT; };
-               521C0BB215FA5E3F00604B61 /* CKDPersistentState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CKDPersistentState.m; path = SOSCircle/CloudKeychainProxy/CKDPersistentState.m; sourceTree = SOURCE_ROOT; };
-               521C0BB315FA5E3F00604B61 /* cloudkeychainproxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = cloudkeychainproxy.m; path = SOSCircle/CloudKeychainProxy/cloudkeychainproxy.m; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
                521C0CD515FF9B3300604B61 /* SOSRegressionUtilities.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSRegressionUtilities.c; sourceTree = "<group>"; };
                521C0CD815FF9B4B00604B61 /* SOSRegressionUtilities.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSRegressionUtilities.h; sourceTree = "<group>"; };
                521C0CD515FF9B3300604B61 /* SOSRegressionUtilities.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSRegressionUtilities.c; sourceTree = "<group>"; };
                521C0CD815FF9B4B00604B61 /* SOSRegressionUtilities.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSRegressionUtilities.h; sourceTree = "<group>"; };
-               521C0CD915FFA05000604B61 /* CKDKeyValueStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = CKDKeyValueStore.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
-               521C0CDA15FFA05000604B61 /* CKDKeyValueStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CKDKeyValueStore.m; sourceTree = "<group>"; };
                521C685C1614A6E100E31C3E /* SOSCloudKeychainClient.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = SOSCloudKeychainClient.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
                521C685D1614A6E100E31C3E /* SOSCloudKeychainClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SOSCloudKeychainClient.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
                521C685C1614A6E100E31C3E /* SOSCloudKeychainClient.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = SOSCloudKeychainClient.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
                521C685D1614A6E100E31C3E /* SOSCloudKeychainClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SOSCloudKeychainClient.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
-               522B0ED31649A68E00A4675D /* MobileKeyBag.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileKeyBag.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.Internal.sdk/System/Library/PrivateFrameworks/MobileKeyBag.framework; sourceTree = DEVELOPER_DIR; };
+               5221C4971CBEDB7C006047E7 /* secd-71-engine-save.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-71-engine-save.c"; sourceTree = "<group>"; };
+               5221C4C11CC5667E006047E7 /* secd-71-engine-save-sample1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "secd-71-engine-save-sample1.h"; sourceTree = "<group>"; };
                523CBBF41B321C5C002C0884 /* secd-50-message.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-50-message.c"; sourceTree = "<group>"; };
                523CBBF71B3227A2002C0884 /* secd-49-manifests.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-49-manifests.c"; sourceTree = "<group>"; };
                526CBA5116079FB4008DF7C8 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = "../../build/Products/Debug-iphoneos/Security.framework"; sourceTree = "<group>"; };
                523CBBF41B321C5C002C0884 /* secd-50-message.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-50-message.c"; sourceTree = "<group>"; };
                523CBBF71B3227A2002C0884 /* secd-49-manifests.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-49-manifests.c"; sourceTree = "<group>"; };
                526CBA5116079FB4008DF7C8 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = "../../build/Products/Debug-iphoneos/Security.framework"; sourceTree = "<group>"; };
-               5272501916838BB20029AADD /* CloudKeychainProxy.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = CloudKeychainProxy.1; sourceTree = "<group>"; };
                527258CF1981C00F003CFCEC /* secd-70-engine.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-70-engine.c"; sourceTree = "<group>"; };
                527258CF1981C00F003CFCEC /* secd-70-engine.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-70-engine.c"; sourceTree = "<group>"; };
-               52840291164050C80035F320 /* CKDUserInteraction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CKDUserInteraction.h; path = SOSCircle/CloudKeychainProxy/CKDUserInteraction.h; sourceTree = SOURCE_ROOT; };
-               52840292164050C80035F320 /* CKDUserInteraction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CKDUserInteraction.m; path = SOSCircle/CloudKeychainProxy/CKDUserInteraction.m; sourceTree = SOURCE_ROOT; };
-               528402A0164445760035F320 /* libCloudKeychainProxy.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libCloudKeychainProxy.a; sourceTree = BUILT_PRODUCTS_DIR; };
                528462991AE6FCF0004C1BA2 /* SOSBackupEvent.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSBackupEvent.c; sourceTree = "<group>"; };
                5284629A1AE6FCF0004C1BA2 /* SOSBackupEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSBackupEvent.h; sourceTree = "<group>"; };
                529F46F11AEC759E0002392C /* secd-34-backup-der-parse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-34-backup-der-parse.c"; sourceTree = "<group>"; };
                528462991AE6FCF0004C1BA2 /* SOSBackupEvent.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSBackupEvent.c; sourceTree = "<group>"; };
                5284629A1AE6FCF0004C1BA2 /* SOSBackupEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSBackupEvent.h; sourceTree = "<group>"; };
                529F46F11AEC759E0002392C /* secd-34-backup-der-parse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-34-backup-der-parse.c"; sourceTree = "<group>"; };
-               52C3D18E169A53150091D9D3 /* ckdmain.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = ckdmain.m; path = SOSCircle/CloudKeychainProxy/ckdmain.m; sourceTree = SOURCE_ROOT; };
                52D0F026169CA72800F07D79 /* SecOnOSX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecOnOSX.h; sourceTree = "<group>"; };
                52DD7069160CD40B0027A346 /* libutilities.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libutilities.a; path = ../../build/Release/libutilities.a; sourceTree = "<group>"; };
                52F8DE4A1AF2E9AE00A2C271 /* SOSTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSTypes.h; sourceTree = "<group>"; };
                52D0F026169CA72800F07D79 /* SecOnOSX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecOnOSX.h; sourceTree = "<group>"; };
                52DD7069160CD40B0027A346 /* libutilities.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libutilities.a; path = ../../build/Release/libutilities.a; sourceTree = "<group>"; };
                52F8DE4A1AF2E9AE00A2C271 /* SOSTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSTypes.h; sourceTree = "<group>"; };
@@ -895,36 +899,35 @@
                5356520418E3C88D00C383C0 /* SecOTRRemote.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecOTRRemote.h; sourceTree = "<group>"; };
                5384299318E492A300E91AFE /* secd-70-otr-remote.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-70-otr-remote.c"; sourceTree = "<group>"; };
                5DE4A7BC17441CCD0036339E /* si-71-mobile-store-policy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-71-mobile-store-policy.c"; sourceTree = "<group>"; };
                5356520418E3C88D00C383C0 /* SecOTRRemote.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecOTRRemote.h; sourceTree = "<group>"; };
                5384299318E492A300E91AFE /* secd-70-otr-remote.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-70-otr-remote.c"; sourceTree = "<group>"; };
                5DE4A7BC17441CCD0036339E /* si-71-mobile-store-policy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-71-mobile-store-policy.c"; sourceTree = "<group>"; };
+               5E0CE1641CB6347300E75776 /* secd-83-item-match-valid-on-date.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-83-item-match-valid-on-date.m"; sourceTree = "<group>"; };
+               5E0CE1661CB6348D00E75776 /* secd-83-item-match-trusted.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-83-item-match-trusted.m"; sourceTree = "<group>"; };
+               5E0CE1681CB64A1300E75776 /* secd-83-item-match.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "secd-83-item-match.h"; sourceTree = "<group>"; };
                5E19C6471AA5F34E005964F8 /* secd-81-item-acl-stress.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "secd-81-item-acl-stress.c"; sourceTree = "<group>"; };
                5EA016361AD41AB20061BCD7 /* secd-81-item-acl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-81-item-acl.c"; sourceTree = "<group>"; };
                5E19C6471AA5F34E005964F8 /* secd-81-item-acl-stress.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "secd-81-item-acl-stress.c"; sourceTree = "<group>"; };
                5EA016361AD41AB20061BCD7 /* secd-81-item-acl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-81-item-acl.c"; sourceTree = "<group>"; };
+               5EF2596E1CB5214B009B4C58 /* secd-83-item-match-policy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "secd-83-item-match-policy.m"; sourceTree = "<group>"; };
                724D7363177A13A500FA10A1 /* AppleBaselineEscrowCertificates.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppleBaselineEscrowCertificates.h; sourceTree = "<group>"; };
                7255A46B1783333D006A8B9A /* si-74-OTAPKISigner.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-74-OTAPKISigner.c"; sourceTree = "<group>"; };
                724D7363177A13A500FA10A1 /* AppleBaselineEscrowCertificates.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppleBaselineEscrowCertificates.h; sourceTree = "<group>"; };
                7255A46B1783333D006A8B9A /* si-74-OTAPKISigner.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-74-OTAPKISigner.c"; sourceTree = "<group>"; };
-               7255F91317A973D5004A9F38 /* si-75-AppleIDRecordSigning.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-75-AppleIDRecordSigning.c"; sourceTree = "<group>"; };
                72B5923A17C6924000AE738B /* iCloudTrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iCloudTrace.h; sourceTree = "<group>"; };
                72B5923C17C6939A00AE738B /* iCloudTrace.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = iCloudTrace.c; sourceTree = "<group>"; };
                72B5923A17C6924000AE738B /* iCloudTrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iCloudTrace.h; sourceTree = "<group>"; };
                72B5923C17C6939A00AE738B /* iCloudTrace.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = iCloudTrace.c; sourceTree = "<group>"; };
-               72E2DC0616BC47C800E7B236 /* OTATrustUtilities.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = OTATrustUtilities.c; sourceTree = "<group>"; };
+               72E2DC0616BC47C800E7B236 /* OTATrustUtilities.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = OTATrustUtilities.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
                72E2DC0716BC47C800E7B236 /* OTATrustUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTATrustUtilities.h; sourceTree = "<group>"; };
                72E2DC0716BC47C800E7B236 /* OTATrustUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OTATrustUtilities.h; sourceTree = "<group>"; };
-               7DE2092F192D29D90066419C /* si-79-smp-cert-policy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-79-smp-cert-policy.c"; sourceTree = "<group>"; };
-               858A54641BC6FD3E008A03FA /* si-88-sectrust-vpnprofile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-88-sectrust-vpnprofile.c"; sourceTree = "<group>"; };
-               858A54651BC6FD3E008A03FA /* si-88-sectrust-vpnprofile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-88-sectrust-vpnprofile.h"; sourceTree = "<group>"; };
                ACFD56BD19007B2D00F5F5D9 /* ios6_1_keychain_2_db.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ios6_1_keychain_2_db.h; sourceTree = "<group>"; };
                BE061FCE1899E5BD00C739F6 /* si-76-shared-credentials.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-76-shared-credentials.c"; sourceTree = "<group>"; };
                BE0CC6061A96B68400662E69 /* si-83-seccertificate-sighashalg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-83-seccertificate-sighashalg.c"; sourceTree = "<group>"; };
                BE3171921BB3559600BBB212 /* si-20-sectrust.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-20-sectrust.h"; sourceTree = "<group>"; };
                ACFD56BD19007B2D00F5F5D9 /* ios6_1_keychain_2_db.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ios6_1_keychain_2_db.h; sourceTree = "<group>"; };
                BE061FCE1899E5BD00C739F6 /* si-76-shared-credentials.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-76-shared-credentials.c"; sourceTree = "<group>"; };
                BE0CC6061A96B68400662E69 /* si-83-seccertificate-sighashalg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-83-seccertificate-sighashalg.c"; sourceTree = "<group>"; };
                BE3171921BB3559600BBB212 /* si-20-sectrust.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-20-sectrust.h"; sourceTree = "<group>"; };
+               BE4AC7DC1C938698002A28FE /* SecSignatureVerificationSupport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecSignatureVerificationSupport.c; sourceTree = "<group>"; };
+               BE4AC7DD1C938698002A28FE /* SecSignatureVerificationSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecSignatureVerificationSupport.h; sourceTree = "<group>"; };
                BE556A5D19550E1600E6EE8C /* SecPolicyCerts.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecPolicyCerts.h; sourceTree = "<group>"; };
                BE62D75F1747FF3E001EAA9D /* si-72-syncableitems.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-72-syncableitems.c"; sourceTree = "<group>"; };
                BE62D7611747FF51001EAA9D /* si-70-sectrust-unified.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-70-sectrust-unified.c"; sourceTree = "<group>"; };
                BE642BAF188F32AD00C899A2 /* SecSharedCredential.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecSharedCredential.h; sourceTree = "<group>"; };
                BE642BB1188F32C200C899A2 /* SecSharedCredential.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecSharedCredential.c; sourceTree = "<group>"; };
                BE556A5D19550E1600E6EE8C /* SecPolicyCerts.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecPolicyCerts.h; sourceTree = "<group>"; };
                BE62D75F1747FF3E001EAA9D /* si-72-syncableitems.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-72-syncableitems.c"; sourceTree = "<group>"; };
                BE62D7611747FF51001EAA9D /* si-70-sectrust-unified.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-70-sectrust-unified.c"; sourceTree = "<group>"; };
                BE642BAF188F32AD00C899A2 /* SecSharedCredential.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecSharedCredential.h; sourceTree = "<group>"; };
                BE642BB1188F32C200C899A2 /* SecSharedCredential.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecSharedCredential.c; sourceTree = "<group>"; };
-               BE794825196DBEAD00F4BA63 /* si-81-sectrust-server-auth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-81-sectrust-server-auth.c"; sourceTree = "<group>"; };
                BE8D228E1ABB7199009A4E18 /* libSecTrustOSX.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSecTrustOSX.a; sourceTree = BUILT_PRODUCTS_DIR; };
                BE8D22C11ABB9B6E009A4E18 /* SecTrustInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecTrustInternal.h; sourceTree = "<group>"; };
                BE8D228E1ABB7199009A4E18 /* libSecTrustOSX.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSecTrustOSX.a; sourceTree = BUILT_PRODUCTS_DIR; };
                BE8D22C11ABB9B6E009A4E18 /* SecTrustInternal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecTrustInternal.h; sourceTree = "<group>"; };
-               BECC54E31B98FF0000FB91DC /* si-86-sectrust-eap-tls.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-86-sectrust-eap-tls.c"; sourceTree = "<group>"; };
-               BECC54E41B98FF0000FB91DC /* si-86-sectrust-eap-tls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-86-sectrust-eap-tls.h"; sourceTree = "<group>"; };
                BEF9640618B4171200813FA3 /* libSWCAgent.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSWCAgent.a; sourceTree = BUILT_PRODUCTS_DIR; };
                BEF9640918B418A400813FA3 /* swcagent_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = swcagent_client.h; path = SharedWebCredential/swcagent_client.h; sourceTree = "<group>"; };
                BEF9640A18B418A400813FA3 /* swcagent_client.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = swcagent_client.c; path = SharedWebCredential/swcagent_client.c; sourceTree = "<group>"; };
                BEF9640618B4171200813FA3 /* libSWCAgent.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSWCAgent.a; sourceTree = BUILT_PRODUCTS_DIR; };
                BEF9640918B418A400813FA3 /* swcagent_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = swcagent_client.h; path = SharedWebCredential/swcagent_client.h; sourceTree = "<group>"; };
                BEF9640A18B418A400813FA3 /* swcagent_client.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = swcagent_client.c; path = SharedWebCredential/swcagent_client.c; sourceTree = "<group>"; };
-               BEF9640B18B418A400813FA3 /* swcagent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = swcagent.m; path = SharedWebCredential/swcagent.m; sourceTree = "<group>"; };
+               BEF9640B18B418A400813FA3 /* swcagent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = swcagent.m; path = SharedWebCredential/swcagent.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
                C62A296818996D90006C3A11 /* SecAccessControlPriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecAccessControlPriv.h; sourceTree = "<group>"; };
                C6766767189884D200E9A12C /* SecAccessControl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecAccessControl.c; sourceTree = "<group>"; };
                C6EE78BA189821AD009B8FEB /* SecAccessControl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecAccessControl.h; sourceTree = "<group>"; };
                C62A296818996D90006C3A11 /* SecAccessControlPriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecAccessControlPriv.h; sourceTree = "<group>"; };
                C6766767189884D200E9A12C /* SecAccessControl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecAccessControl.c; sourceTree = "<group>"; };
                C6EE78BA189821AD009B8FEB /* SecAccessControl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecAccessControl.h; sourceTree = "<group>"; };
@@ -947,12 +950,7 @@
                CD32777618F8B39B006B5280 /* SOSTransportMessageKVS.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSTransportMessageKVS.c; sourceTree = "<group>"; };
                CD32777818F8B3B4006B5280 /* SOSTransportMessageKVS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSTransportMessageKVS.h; sourceTree = "<group>"; };
                CD35B8291C2650FE00E0852A /* secd-154-engine-backoff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-154-engine-backoff.c"; sourceTree = "<group>"; };
                CD32777618F8B39B006B5280 /* SOSTransportMessageKVS.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSTransportMessageKVS.c; sourceTree = "<group>"; };
                CD32777818F8B3B4006B5280 /* SOSTransportMessageKVS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSTransportMessageKVS.h; sourceTree = "<group>"; };
                CD35B8291C2650FE00E0852A /* secd-154-engine-backoff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-154-engine-backoff.c"; sourceTree = "<group>"; };
-               CD3F914B1A802EBF00E07119 /* libIDSKeychainSyncingProxy.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libIDSKeychainSyncingProxy.a; sourceTree = BUILT_PRODUCTS_DIR; };
                CD558FA8193544F800CFB3B1 /* IDSFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IDSFoundation.framework; path = ../../../../../../../System/Library/PrivateFrameworks/IDSFoundation.framework; sourceTree = "<group>"; };
                CD558FA8193544F800CFB3B1 /* IDSFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IDSFoundation.framework; path = ../../../../../../../System/Library/PrivateFrameworks/IDSFoundation.framework; sourceTree = "<group>"; };
-               CD5D34011A80391B00EBF353 /* IDSProxy.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = IDSProxy.h; sourceTree = "<group>"; };
-               CD5D34021A80391B00EBF353 /* IDSProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IDSProxy.m; sourceTree = "<group>"; };
-               CD5D34041A80391B00EBF353 /* idskeychainsyncingproxy.entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = idskeychainsyncingproxy.entitlements.plist; sourceTree = "<group>"; };
-               CD5D34051A80391B00EBF353 /* idskeychainsyncingproxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = idskeychainsyncingproxy.m; sourceTree = "<group>"; };
                CD655E911AF02B9900BD1B6E /* secd-62-account-backup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-62-account-backup.c"; sourceTree = "<group>"; };
                CD6C9BF81A813D52002AB913 /* IDS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IDS.framework; path = System/Library/PrivateFrameworks/IDS.framework; sourceTree = SDKROOT; };
                CD773AC21ADDF8C700C808BA /* SOSTransportBackupPeer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSTransportBackupPeer.c; sourceTree = "<group>"; };
                CD655E911AF02B9900BD1B6E /* secd-62-account-backup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-62-account-backup.c"; sourceTree = "<group>"; };
                CD6C9BF81A813D52002AB913 /* IDS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IDS.framework; path = System/Library/PrivateFrameworks/IDS.framework; sourceTree = SDKROOT; };
                CD773AC21ADDF8C700C808BA /* SOSTransportBackupPeer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSTransportBackupPeer.c; sourceTree = "<group>"; };
@@ -960,6 +958,7 @@
                CD86DE4D18BD554D00C90CDF /* SOSTransport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSTransport.c; sourceTree = "<group>"; };
                CD8E09001A2E918900A2503A /* otr-40-edgecases.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "otr-40-edgecases.c"; sourceTree = "<group>"; };
                CD8F442C1B83C435004C0047 /* secd-95-escrow-persistence.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-95-escrow-persistence.c"; sourceTree = "<group>"; };
                CD86DE4D18BD554D00C90CDF /* SOSTransport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSTransport.c; sourceTree = "<group>"; };
                CD8E09001A2E918900A2503A /* otr-40-edgecases.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "otr-40-edgecases.c"; sourceTree = "<group>"; };
                CD8F442C1B83C435004C0047 /* secd-95-escrow-persistence.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-95-escrow-persistence.c"; sourceTree = "<group>"; };
+               CD9B54111CC6EC4D00CC487A /* secd-100-initialsync.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-100-initialsync.c"; sourceTree = "<group>"; };
                CDA7729616B899F10069434D /* si-69-keydesc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-69-keydesc.c"; sourceTree = "<group>"; };
                CDAD4E9818EC8424007D4BC2 /* SOSTransportTestTransports.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSTransportTestTransports.c; sourceTree = "<group>"; };
                CDAD4E9A18EC8447007D4BC2 /* SOSTransportTestTransports.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSTransportTestTransports.h; sourceTree = "<group>"; };
                CDA7729616B899F10069434D /* si-69-keydesc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-69-keydesc.c"; sourceTree = "<group>"; };
                CDAD4E9818EC8424007D4BC2 /* SOSTransportTestTransports.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSTransportTestTransports.c; sourceTree = "<group>"; };
                CDAD4E9A18EC8447007D4BC2 /* SOSTransportTestTransports.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSTransportTestTransports.h; sourceTree = "<group>"; };
@@ -991,24 +990,33 @@
                CDC0DC9A1AE842640020BA6C /* SOSGenCount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSGenCount.h; sourceTree = "<group>"; };
                CDC765C01729A72800721712 /* SecPasswordGenerate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecPasswordGenerate.c; sourceTree = "<group>"; };
                CDC765C11729A72800721712 /* SecPasswordGenerate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecPasswordGenerate.h; sourceTree = "<group>"; };
                CDC0DC9A1AE842640020BA6C /* SOSGenCount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSGenCount.h; sourceTree = "<group>"; };
                CDC765C01729A72800721712 /* SecPasswordGenerate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecPasswordGenerate.c; sourceTree = "<group>"; };
                CDC765C11729A72800721712 /* SecPasswordGenerate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecPasswordGenerate.h; sourceTree = "<group>"; };
-               CDD4500F1ACF134A00A37449 /* IDSPersistentState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDSPersistentState.h; sourceTree = "<group>"; };
-               CDD450101ACF13BC00A37449 /* IDSPersistentState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IDSPersistentState.m; sourceTree = "<group>"; };
                CDD565A1173193AC00B6B074 /* si-73-secpasswordgenerate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-73-secpasswordgenerate.c"; sourceTree = "<group>"; };
                CDF1B82218BD7DDE006309BC /* SOSTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSTransport.h; sourceTree = "<group>"; };
                CDD565A1173193AC00B6B074 /* si-73-secpasswordgenerate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-73-secpasswordgenerate.c"; sourceTree = "<group>"; };
                CDF1B82218BD7DDE006309BC /* SOSTransport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSTransport.h; sourceTree = "<group>"; };
-               CDF42C061A884BB10080BB05 /* idksmain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = idksmain.m; sourceTree = "<group>"; };
                CDF9BBE01B03E24D00D1AF0F /* secd-52-offering-gencount-reset.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-52-offering-gencount-reset.c"; sourceTree = "<group>"; };
                CDF9BBE01B03E24D00D1AF0F /* secd-52-offering-gencount-reset.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-52-offering-gencount-reset.c"; sourceTree = "<group>"; };
-               D40294A71C20A806008CE4B6 /* si-91-sectrust-ast2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-91-sectrust-ast2.c"; sourceTree = "<group>"; };
-               D40294A81C20A806008CE4B6 /* si-91-sectrust-ast2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-91-sectrust-ast2.h"; sourceTree = "<group>"; };
-               D41380C71C6E529500F1A4B6 /* si-92-sectrust-homekit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-92-sectrust-homekit.c"; sourceTree = "<group>"; };
-               D41380C81C6E529500F1A4B6 /* si-92-sectrust-homekit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-92-sectrust-homekit.h"; sourceTree = "<group>"; };
+               D40771AB1C9B4C530016AA66 /* si-82-seccertificate-ct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "si-82-seccertificate-ct.c"; path = "../../../../shared_regressions/si-82-seccertificate-ct.c"; sourceTree = "<group>"; };
+               D40771AC1C9B4C530016AA66 /* si-82-sectrust-ct.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "si-82-sectrust-ct.m"; path = "../../../../shared_regressions/si-82-sectrust-ct.m"; sourceTree = "<group>"; };
+               D40771B21C9B4CE50016AA66 /* shared_regressions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = shared_regressions.h; path = ../../shared_regressions/shared_regressions.h; sourceTree = "<group>"; };
+               D40771B81C9B4D200016AA66 /* libSharedRegressions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSharedRegressions.a; sourceTree = BUILT_PRODUCTS_DIR; };
                D4273AA21B5D54CA0007D67B /* nameconstraints.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nameconstraints.c; sourceTree = "<group>"; };
                D4273AA31B5D54CA0007D67B /* nameconstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nameconstraints.h; sourceTree = "<group>"; };
                D4273AA21B5D54CA0007D67B /* nameconstraints.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nameconstraints.c; sourceTree = "<group>"; };
                D4273AA31B5D54CA0007D67B /* nameconstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nameconstraints.h; sourceTree = "<group>"; };
-               D445CDDF1B44D372005040AC /* si-84-sectrust-atv-appsigning.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-84-sectrust-atv-appsigning.c"; sourceTree = "<group>"; };
+               D44216091CCAD9C200D2D455 /* si-22-sectrust-iap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-22-sectrust-iap.h"; sourceTree = "<group>"; };
+               D44C81E71CD1944C00BE9A0D /* si-97-sectrust-path-scoring.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "si-97-sectrust-path-scoring.m"; sourceTree = "<group>"; };
+               D44C81E91CD1947200BE9A0D /* si-97-sectrust-path-scoring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-97-sectrust-path-scoring.h"; sourceTree = "<group>"; };
+               D4653DEA1C9E2299002ED6D5 /* si-28-sectrustsettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-28-sectrustsettings.h"; sourceTree = "<group>"; };
+               D474EF321C8A1CBB00AA4D86 /* personalization.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = personalization.c; sourceTree = "<group>"; };
+               D474EF331C8A1CBB00AA4D86 /* personalization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = personalization.h; sourceTree = "<group>"; };
+               D47F511B1C3B660500A7CEFE /* SecCFAllocator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecCFAllocator.c; sourceTree = "<group>"; };
+               D47F511C1C3B660500A7CEFE /* SecCFAllocator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecCFAllocator.h; sourceTree = "<group>"; };
+               D48C567C1C73E5C300E41928 /* SecPolicyLeafCallbacks.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecPolicyLeafCallbacks.c; sourceTree = "<group>"; };
+               D4A919751CA9A3DD003D2ADA /* si-95-cms-basic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-95-cms-basic.c"; sourceTree = "<group>"; };
+               D4A919761CA9A3DD003D2ADA /* si-95-cms-basic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-95-cms-basic.h"; sourceTree = "<group>"; };
                D4B4A9A61B8801960097B393 /* si-85-sectrust-ssl-policy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-85-sectrust-ssl-policy.c"; sourceTree = "<group>"; };
                D4B4A9A61B8801960097B393 /* si-85-sectrust-ssl-policy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-85-sectrust-ssl-policy.c"; sourceTree = "<group>"; };
+               D4C6E1681B9A0AE800E42591 /* si-85-sectrust-ssl-policy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-85-sectrust-ssl-policy.h"; sourceTree = "<group>"; };
                D4CBC1461BE9A89E00C5795E /* si-89-cms-hash-agility.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-89-cms-hash-agility.c"; sourceTree = "<group>"; };
                D4CBC1471BE9A89E00C5795E /* si-89-cms-hash-agility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-89-cms-hash-agility.h"; sourceTree = "<group>"; };
                D4DFC9481B9958D00040945C /* si-87-sectrust-name-constraints.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-87-sectrust-name-constraints.c"; sourceTree = "<group>"; };
                D4DFC9491B9958D00040945C /* si-87-sectrust-name-constraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-87-sectrust-name-constraints.h"; sourceTree = "<group>"; };
                D4CBC1461BE9A89E00C5795E /* si-89-cms-hash-agility.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-89-cms-hash-agility.c"; sourceTree = "<group>"; };
                D4CBC1471BE9A89E00C5795E /* si-89-cms-hash-agility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-89-cms-hash-agility.h"; sourceTree = "<group>"; };
                D4DFC9481B9958D00040945C /* si-87-sectrust-name-constraints.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-87-sectrust-name-constraints.c"; sourceTree = "<group>"; };
                D4DFC9491B9958D00040945C /* si-87-sectrust-name-constraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "si-87-sectrust-name-constraints.h"; sourceTree = "<group>"; };
+               D4EC94D31CEA47D70083E753 /* si-20-sectrust-policies.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "si-20-sectrust-policies.m"; path = "../../../../shared_regressions/si-20-sectrust-policies.m"; sourceTree = "<group>"; };
                E702E75614E1F3EA00CDE635 /* libSecureObjectSync.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSecureObjectSync.a; sourceTree = BUILT_PRODUCTS_DIR; };
                E702E77814E1F48800CDE635 /* libSOSRegressions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSOSRegressions.a; sourceTree = BUILT_PRODUCTS_DIR; };
                E703811114E1FEE4007CB458 /* SOSCloudCircle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSCloudCircle.h; sourceTree = "<group>"; };
                E702E75614E1F3EA00CDE635 /* libSecureObjectSync.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSecureObjectSync.a; sourceTree = BUILT_PRODUCTS_DIR; };
                E702E77814E1F48800CDE635 /* libSOSRegressions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSOSRegressions.a; sourceTree = BUILT_PRODUCTS_DIR; };
                E703811114E1FEE4007CB458 /* SOSCloudCircle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSCloudCircle.h; sourceTree = "<group>"; };
@@ -1024,9 +1032,11 @@
                E7217B1715F80E0F00D26031 /* SOSCloudCircle.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = SOSCloudCircle.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
                E7217B2515F8131A00D26031 /* SOSCloudKeychainConstants.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = SOSCloudKeychainConstants.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
                E7217B2615F8131A00D26031 /* SOSCloudKeychainConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSCloudKeychainConstants.h; sourceTree = "<group>"; };
                E7217B1715F80E0F00D26031 /* SOSCloudCircle.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = SOSCloudCircle.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
                E7217B2515F8131A00D26031 /* SOSCloudKeychainConstants.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = SOSCloudKeychainConstants.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
                E7217B2615F8131A00D26031 /* SOSCloudKeychainConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SOSCloudKeychainConstants.h; sourceTree = "<group>"; };
-               E7295C6714E3571A007FBB20 /* Empty.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = Empty.c; sourceTree = "<group>"; };
                E731829F1B1FC9CD00FC334C /* secd-63-account-resurrection.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-63-account-resurrection.c"; sourceTree = "<group>"; };
                E731829F1B1FC9CD00FC334C /* secd-63-account-resurrection.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-63-account-resurrection.c"; sourceTree = "<group>"; };
+               E739A9DA1D3078D9003C088A /* NSFileHandle+Formatting.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSFileHandle+Formatting.m"; sourceTree = "<group>"; };
+               E739A9DC1D318FA4003C088A /* secd-130-other-peer-views.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-130-other-peer-views.c"; sourceTree = "<group>"; };
                E748744415A61AF800624935 /* si-68-secmatchissuer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-68-secmatchissuer.c"; sourceTree = "<group>"; };
                E748744415A61AF800624935 /* si-68-secmatchissuer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-68-secmatchissuer.c"; sourceTree = "<group>"; };
+               E75320EB1D0B83FC00DAB140 /* SOSAccountViewSync.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSAccountViewSync.c; sourceTree = "<group>"; };
                E757D42219254B3200AF22D9 /* SecECKeyPriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecECKeyPriv.h; sourceTree = "<group>"; };
                E75AB9191AE9958300C5EF3F /* secd-40-cc-gestalt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-40-cc-gestalt.c"; sourceTree = "<group>"; };
                E76079D21951FD2800F69731 /* liblogging.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblogging.a; sourceTree = BUILT_PRODUCTS_DIR; };
                E757D42219254B3200AF22D9 /* SecECKeyPriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecECKeyPriv.h; sourceTree = "<group>"; };
                E75AB9191AE9958300C5EF3F /* secd-40-cc-gestalt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-40-cc-gestalt.c"; sourceTree = "<group>"; };
                E76079D21951FD2800F69731 /* liblogging.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblogging.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1038,6 +1048,7 @@
                E777C72515B87544004044A8 /* SOSPeerInfo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSPeerInfo.c; sourceTree = "<group>"; };
                E777C72815B9C9F0004044A8 /* sc-30-peerinfo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sc-30-peerinfo.c"; sourceTree = "<group>"; };
                E7850ECE1BB30E6E002A54CA /* secd-65-account-retirement-reset.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-65-account-retirement-reset.c"; sourceTree = "<group>"; };
                E777C72515B87544004044A8 /* SOSPeerInfo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSPeerInfo.c; sourceTree = "<group>"; };
                E777C72815B9C9F0004044A8 /* sc-30-peerinfo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sc-30-peerinfo.c"; sourceTree = "<group>"; };
                E7850ECE1BB30E6E002A54CA /* secd-65-account-retirement-reset.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-65-account-retirement-reset.c"; sourceTree = "<group>"; };
+               E78DCD671D306C9000DE7A88 /* NSFileHandle+Formatting.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSFileHandle+Formatting.h"; sourceTree = "<group>"; };
                E790C0F4169E3D7200E0C0C9 /* keychain_sync.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = keychain_sync.h; sourceTree = "<group>"; };
                E790C108169E4E7900E0C0C9 /* builtin_commands.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = builtin_commands.h; sourceTree = "<group>"; };
                E790C109169E4FD200E0C0C9 /* digest_calc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = digest_calc.c; sourceTree = "<group>"; };
                E790C0F4169E3D7200E0C0C9 /* keychain_sync.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = keychain_sync.h; sourceTree = "<group>"; };
                E790C108169E4E7900E0C0C9 /* builtin_commands.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = builtin_commands.h; sourceTree = "<group>"; };
                E790C109169E4FD200E0C0C9 /* digest_calc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = digest_calc.c; sourceTree = "<group>"; };
@@ -1069,6 +1080,8 @@
                E7A10FAD1771249C00C4602F /* secd-57-account-leave.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-57-account-leave.c"; sourceTree = "<group>"; };
                E7A634E217FA471500920B67 /* SOSPeerInfoCollections.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSPeerInfoCollections.c; sourceTree = "<group>"; };
                E7A634E417FA472700920B67 /* SOSPeerInfoCollections.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSPeerInfoCollections.h; sourceTree = "<group>"; };
                E7A10FAD1771249C00C4602F /* secd-57-account-leave.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-57-account-leave.c"; sourceTree = "<group>"; };
                E7A634E217FA471500920B67 /* SOSPeerInfoCollections.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SOSPeerInfoCollections.c; sourceTree = "<group>"; };
                E7A634E417FA472700920B67 /* SOSPeerInfoCollections.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SOSPeerInfoCollections.h; sourceTree = "<group>"; };
+               E7ACD2F91D30204E0038050D /* keychain_sync_test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = keychain_sync_test.m; sourceTree = "<group>"; };
+               E7ACD2FA1D30204E0038050D /* keychain_sync_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keychain_sync_test.h; sourceTree = "<group>"; };
                E7B00701170B58BD00B27966 /* SecExports.exp-in */ = {isa = PBXFileReference; lastKnownFileType = text; path = "SecExports.exp-in"; sourceTree = "<group>"; };
                E7B00702170B5FE100B27966 /* SOSExports.exp-in */ = {isa = PBXFileReference; lastKnownFileType = text; lineEnding = 0; path = "SOSExports.exp-in"; sourceTree = "<group>"; };
                E7B01B5A16532507000485F1 /* SOSCloudCircleInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SOSCloudCircleInternal.h; sourceTree = "<group>"; };
                E7B00701170B58BD00B27966 /* SecExports.exp-in */ = {isa = PBXFileReference; lastKnownFileType = text; path = "SecExports.exp-in"; sourceTree = "<group>"; };
                E7B00702170B5FE100B27966 /* SOSExports.exp-in */ = {isa = PBXFileReference; lastKnownFileType = text; lineEnding = 0; path = "SOSExports.exp-in"; sourceTree = "<group>"; };
                E7B01B5A16532507000485F1 /* SOSCloudCircleInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SOSCloudCircleInternal.h; sourceTree = "<group>"; };
@@ -1090,10 +1103,10 @@
                E7FEFB8C169E363300E18152 /* libSOSCommands.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSOSCommands.a; sourceTree = BUILT_PRODUCTS_DIR; };
                E7FEFB90169E36D800E18152 /* keychain_sync.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = keychain_sync.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
                EB3409AE1C1D5BB300D77661 /* secd-20-keychain_upgrade.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "secd-20-keychain_upgrade.m"; sourceTree = "<group>"; };
                E7FEFB8C169E363300E18152 /* libSOSCommands.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSOSCommands.a; sourceTree = BUILT_PRODUCTS_DIR; };
                E7FEFB90169E36D800E18152 /* keychain_sync.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = keychain_sync.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
                EB3409AE1C1D5BB300D77661 /* secd-20-keychain_upgrade.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "secd-20-keychain_upgrade.m"; sourceTree = "<group>"; };
+               EB6432BC1C510A6E00B671F2 /* SecDigest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SecDigest.c; sourceTree = "<group>"; };
                EB69AB031BF3C42F00913AF1 /* SecEMCS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecEMCS.m; sourceTree = "<group>"; };
                EB69AB051BF425F300913AF1 /* si-90-emcs.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "si-90-emcs.m"; sourceTree = "<group>"; };
                EB69AB081BF4335100913AF1 /* SecEMCSPriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecEMCSPriv.h; sourceTree = "<group>"; };
                EB69AB031BF3C42F00913AF1 /* SecEMCS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecEMCS.m; sourceTree = "<group>"; };
                EB69AB051BF425F300913AF1 /* si-90-emcs.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "si-90-emcs.m"; sourceTree = "<group>"; };
                EB69AB081BF4335100913AF1 /* SecEMCSPriv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecEMCSPriv.h; sourceTree = "<group>"; };
-               EB8F48DC1AE4C81400CE93A7 /* si-25-sectrust-apple-authentication.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "si-25-sectrust-apple-authentication.c"; sourceTree = "<group>"; };
                EB973200189C56310063DFED /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
                EB973204189C56310063DFED /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
                EB973205189C56310063DFED /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
                EB973200189C56310063DFED /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
                EB973204189C56310063DFED /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
                EB973205189C56310063DFED /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -1101,13 +1114,13 @@
                EB97322D189C56DB0063DFED /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = ../../../../../../../System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<group>"; };
                EB9C1D091BDDBDD500F89272 /* si-13-item-system.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "si-13-item-system.m"; sourceTree = "<group>"; };
                EBC1B8B61BE96B3200E6ACA6 /* whoami.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = whoami.m; sourceTree = "<group>"; };
                EB97322D189C56DB0063DFED /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = ../../../../../../../System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<group>"; };
                EB9C1D091BDDBDD500F89272 /* si-13-item-system.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "si-13-item-system.m"; sourceTree = "<group>"; };
                EBC1B8B61BE96B3200E6ACA6 /* whoami.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = whoami.m; sourceTree = "<group>"; };
+               EBD3447F1D234E26008B6DEA /* si-15-delete-access-group.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "si-15-delete-access-group.m"; sourceTree = "<group>"; };
                EBDAECBA184D30C3005A18F1 /* sc-31-peerinfo-simplefuzz.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sc-31-peerinfo-simplefuzz.c"; sourceTree = "<group>"; };
                EBE32B581BEEC8C900719AA8 /* syncbubble.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = syncbubble.m; sourceTree = "<group>"; };
                EBE32B9B1BF00DA500719AA8 /* entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = entitlements.plist; sourceTree = "<group>"; };
                EBF2D7651C1E4823006AB6FF /* secd-21-transmogrify.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "secd-21-transmogrify.m"; sourceTree = "<group>"; };
                F697632118F6CC3F0090438B /* keychain_util.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = keychain_util.c; sourceTree = "<group>"; };
                F697632218F6CC3F0090438B /* keychain_util.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = keychain_util.h; sourceTree = "<group>"; };
                EBDAECBA184D30C3005A18F1 /* sc-31-peerinfo-simplefuzz.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sc-31-peerinfo-simplefuzz.c"; sourceTree = "<group>"; };
                EBE32B581BEEC8C900719AA8 /* syncbubble.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = syncbubble.m; sourceTree = "<group>"; };
                EBE32B9B1BF00DA500719AA8 /* entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = entitlements.plist; sourceTree = "<group>"; };
                EBF2D7651C1E4823006AB6FF /* secd-21-transmogrify.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "secd-21-transmogrify.m"; sourceTree = "<group>"; };
                F697632118F6CC3F0090438B /* keychain_util.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = keychain_util.c; sourceTree = "<group>"; };
                F697632218F6CC3F0090438B /* keychain_util.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = keychain_util.h; sourceTree = "<group>"; };
-               F953A6A71B43538A006EC5E1 /* si-81-sectrust-appletv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "si-81-sectrust-appletv.c"; sourceTree = "<group>"; };
                F9E0BD981AEF196A00554D49 /* secd-82-persistent-ref.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "secd-82-persistent-ref.c"; sourceTree = "<group>"; };
                F9EF72F01AC0F97C00A4D24A /* secd-70-engine-smash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-70-engine-smash.c"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
                F9E0BD981AEF196A00554D49 /* secd-82-persistent-ref.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "secd-82-persistent-ref.c"; sourceTree = "<group>"; };
                F9EF72F01AC0F97C00A4D24A /* secd-70-engine-smash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "secd-70-engine-smash.c"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -1172,13 +1185,6 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               5284029D164445760035F320 /* Frameworks */ = {
-                       isa = PBXFrameworksBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
                BE8D22881ABB7199009A4E18 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                BE8D22881ABB7199009A4E18 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
@@ -1193,11 +1199,10 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               CD3F91481A802EBF00E07119 /* Frameworks */ = {
+               D40771B51C9B4D200016AA66 /* Frameworks */ = {
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXFrameworksBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               43C3B1681AFD588800786702 /* IDS.framework in Frameworks */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -1291,15 +1296,14 @@
                                4A824B03158FF07000F932C0 /* libSecurityRegressions.a */,
                                4CC92B1415A3BC6B00C6D578 /* libsecuritydRegressions.a */,
                                4A5CCA4F15ACEFA500702357 /* libSecOtrOSX.a */,
                                4A824B03158FF07000F932C0 /* libSecurityRegressions.a */,
                                4CC92B1415A3BC6B00C6D578 /* libsecuritydRegressions.a */,
                                4A5CCA4F15ACEFA500702357 /* libSecOtrOSX.a */,
-                               528402A0164445760035F320 /* libCloudKeychainProxy.a */,
                                E71049F2169E023B00DB0045 /* libSecurityTool.a */,
                                E7104A1D169E216E00DB0045 /* libSecurityCommands.a */,
                                E7FEFB8C169E363300E18152 /* libSOSCommands.a */,
                                0C0BDB5F175687EC00BC1A7E /* libsecdRegressions.a */,
                                BEF9640618B4171200813FA3 /* libSWCAgent.a */,
                                E76079D21951FD2800F69731 /* liblogging.a */,
                                E71049F2169E023B00DB0045 /* libSecurityTool.a */,
                                E7104A1D169E216E00DB0045 /* libSecurityCommands.a */,
                                E7FEFB8C169E363300E18152 /* libSOSCommands.a */,
                                0C0BDB5F175687EC00BC1A7E /* libsecdRegressions.a */,
                                BEF9640618B4171200813FA3 /* libSWCAgent.a */,
                                E76079D21951FD2800F69731 /* liblogging.a */,
-                               CD3F914B1A802EBF00E07119 /* libIDSKeychainSyncingProxy.a */,
                                BE8D228E1ABB7199009A4E18 /* libSecTrustOSX.a */,
                                BE8D228E1ABB7199009A4E18 /* libSecTrustOSX.a */,
+                               D40771B81C9B4D200016AA66 /* libSharedRegressions.a */,
                        );
                        name = Products;
                        sourceTree = "<group>";
                        );
                        name = Products;
                        sourceTree = "<group>";
@@ -1318,27 +1322,9 @@
                186CDD3014CA159600AF9171 /* Security */ = {
                        isa = PBXGroup;
                        children = (
                186CDD3014CA159600AF9171 /* Security */ = {
                        isa = PBXGroup;
                        children = (
-                               E7104A0F169E1F0800DB0045 /* Tool */,
                                4A824AFA158FF05900F932C0 /* Regressions */,
                                4A824AFA158FF05900F932C0 /* Regressions */,
-                               52D0F026169CA72800F07D79 /* SecOnOSX.h */,
-                               4A971682158FDEB800D439B7 /* SecOTR.h */,
-                               4A971683158FDEB800D439B7 /* SecOTRDHKey.c */,
-                               4A971684158FDEB800D439B7 /* SecOTRDHKey.h */,
-                               4A971685158FDEB800D439B7 /* SecOTRErrors.h */,
-                               4A971686158FDEB800D439B7 /* SecOTRFullIdentity.c */,
-                               4A971687158FDEB800D439B7 /* SecOTRIdentityPriv.h */,
-                               4A971688158FDEB800D439B7 /* SecOTRMath.c */,
-                               4A971689158FDEB800D439B7 /* SecOTRMath.h */,
-                               4A97168B158FDEB800D439B7 /* SecOTRPacketData.c */,
-                               4A97168C158FDEB800D439B7 /* SecOTRPacketData.h */,
-                               4A97168D158FDEB800D439B7 /* SecOTRPackets.c */,
-                               4A97168E158FDEB800D439B7 /* SecOTRPackets.h */,
-                               4A97168F158FDEB800D439B7 /* SecOTRPublicIdentity.c */,
-                               4A971690158FDEB800D439B7 /* SecOTRSession.c */,
-                               4A971691158FDEB800D439B7 /* SecOTRSession.h */,
-                               4A971692158FDEB800D439B7 /* SecOTRSessionAKE.c */,
-                               4A971693158FDEB800D439B7 /* SecOTRSessionPriv.h */,
-                               4A971694158FDEB800D439B7 /* SecOTRUtils.c */,
+                               E7104A0F169E1F0800DB0045 /* Tool */,
+                               724D7363177A13A500FA10A1 /* AppleBaselineEscrowCertificates.h */,
                                18AD561514CB6EB9008233F2 /* certextensions.h */,
                                18AD561614CB6EB9008233F2 /* p12import.c */,
                                18AD561714CB6EB9008233F2 /* p12import.h */,
                                18AD561514CB6EB9008233F2 /* certextensions.h */,
                                18AD561614CB6EB9008233F2 /* p12import.c */,
                                18AD561714CB6EB9008233F2 /* p12import.h */,
@@ -1346,13 +1332,15 @@
                                18AD561914CB6EB9008233F2 /* p12pbegen.h */,
                                18AD561A14CB6EB9008233F2 /* pbkdf2.c */,
                                18AD561B14CB6EB9008233F2 /* pbkdf2.h */,
                                18AD561914CB6EB9008233F2 /* p12pbegen.h */,
                                18AD561A14CB6EB9008233F2 /* pbkdf2.c */,
                                18AD561B14CB6EB9008233F2 /* pbkdf2.h */,
+                               C6766767189884D200E9A12C /* SecAccessControl.c */,
                                C6EE78BA189821AD009B8FEB /* SecAccessControl.h */,
                                C6EE78BA189821AD009B8FEB /* SecAccessControl.h */,
+                               44B2606C18F82631008DF20F /* SecAccessControlExports.exp-in */,
                                C62A296818996D90006C3A11 /* SecAccessControlPriv.h */,
                                C62A296818996D90006C3A11 /* SecAccessControlPriv.h */,
-                               C6766767189884D200E9A12C /* SecAccessControl.c */,
                                18AD561C14CB6EB9008233F2 /* SecBase.h */,
                                18AD561D14CB6EB9008233F2 /* SecBase64.c */,
                                18AD561E14CB6EB9008233F2 /* SecBase64.h */,
                                18AD561F14CB6EB9008233F2 /* SecBasePriv.h */,
                                18AD561C14CB6EB9008233F2 /* SecBase.h */,
                                18AD561D14CB6EB9008233F2 /* SecBase64.c */,
                                18AD561E14CB6EB9008233F2 /* SecBase64.h */,
                                18AD561F14CB6EB9008233F2 /* SecBasePriv.h */,
+                               18AD562014CB6EB9008233F2 /* SecCertificate.c */,
                                18AD562114CB6EB9008233F2 /* SecCertificate.h */,
                                18AD562214CB6EB9008233F2 /* SecCertificateInternal.h */,
                                18AD562314CB6EB9008233F2 /* SecCertificatePath.c */,
                                18AD562114CB6EB9008233F2 /* SecCertificate.h */,
                                18AD562214CB6EB9008233F2 /* SecCertificateInternal.h */,
                                18AD562314CB6EB9008233F2 /* SecCertificatePath.c */,
@@ -1360,19 +1348,22 @@
                                18AD562514CB6EB9008233F2 /* SecCertificatePriv.h */,
                                18AD562614CB6EB9008233F2 /* SecCertificateRequest.c */,
                                18AD562714CB6EB9008233F2 /* SecCertificateRequest.h */,
                                18AD562514CB6EB9008233F2 /* SecCertificatePriv.h */,
                                18AD562614CB6EB9008233F2 /* SecCertificateRequest.c */,
                                18AD562714CB6EB9008233F2 /* SecCertificateRequest.h */,
+                               D47F511B1C3B660500A7CEFE /* SecCFAllocator.c */,
+                               D47F511C1C3B660500A7CEFE /* SecCFAllocator.h */,
                                18AD562814CB6EB9008233F2 /* SecCMS.c */,
                                18AD562914CB6EB9008233F2 /* SecCMS.h */,
                                449265271AB0D6FF00644D4C /* SecCTKKey.c */,
                                449265281AB0D6FF00644D4C /* SecCTKKeyPriv.h */,
                                18AD562A14CB6EB9008233F2 /* SecDH.c */,
                                18AD562B14CB6EB9008233F2 /* SecDH.h */,
                                18AD562814CB6EB9008233F2 /* SecCMS.c */,
                                18AD562914CB6EB9008233F2 /* SecCMS.h */,
                                449265271AB0D6FF00644D4C /* SecCTKKey.c */,
                                449265281AB0D6FF00644D4C /* SecCTKKeyPriv.h */,
                                18AD562A14CB6EB9008233F2 /* SecDH.c */,
                                18AD562B14CB6EB9008233F2 /* SecDH.h */,
+                               EB6432BC1C510A6E00B671F2 /* SecDigest.c */,
                                18AD562C14CB6EB9008233F2 /* SecECKey.c */,
                                18AD562D14CB6EB9008233F2 /* SecECKey.h */,
                                E757D42219254B3200AF22D9 /* SecECKeyPriv.h */,
                                EB69AB031BF3C42F00913AF1 /* SecEMCS.m */,
                                EB69AB081BF4335100913AF1 /* SecEMCSPriv.h */,
                                18AD562C14CB6EB9008233F2 /* SecECKey.c */,
                                18AD562D14CB6EB9008233F2 /* SecECKey.h */,
                                E757D42219254B3200AF22D9 /* SecECKeyPriv.h */,
                                EB69AB031BF3C42F00913AF1 /* SecEMCS.m */,
                                EB69AB081BF4335100913AF1 /* SecEMCSPriv.h */,
+                               E7B00701170B58BD00B27966 /* SecExports.exp-in */,
                                18AD562E14CB6EB9008233F2 /* SecFramework.c */,
                                18AD562E14CB6EB9008233F2 /* SecFramework.c */,
-                               18AD562014CB6EB9008233F2 /* SecCertificate.c */,
                                18AD562F14CB6EB9008233F2 /* SecFramework.h */,
                                18AD563014CB6EB9008233F2 /* SecFrameworkStrings.h */,
                                18AD563114CB6EB9008233F2 /* SecIdentity.c */,
                                18AD562F14CB6EB9008233F2 /* SecFramework.h */,
                                18AD563014CB6EB9008233F2 /* SecFrameworkStrings.h */,
                                18AD563114CB6EB9008233F2 /* SecIdentity.c */,
@@ -1388,15 +1379,39 @@
                                18AD563914CB6EB9008233F2 /* SecItemConstants.c */,
                                18AD563A14CB6EB9008233F2 /* SecItemInternal.h */,
                                18AD563B14CB6EB9008233F2 /* SecItemPriv.h */,
                                18AD563914CB6EB9008233F2 /* SecItemConstants.c */,
                                18AD563A14CB6EB9008233F2 /* SecItemInternal.h */,
                                18AD563B14CB6EB9008233F2 /* SecItemPriv.h */,
+                               442B69241BC3C5B9000F3A72 /* SecItemShim.h */,
                                18AD563C14CB6EB9008233F2 /* SecKey.c */,
                                18AD563D14CB6EB9008233F2 /* SecKey.h */,
                                18AD563C14CB6EB9008233F2 /* SecKey.c */,
                                18AD563D14CB6EB9008233F2 /* SecKey.h */,
+                               093F67A21CC1171B0033151D /* SecKeyAdaptors.c */,
                                18AD563E14CB6EB9008233F2 /* SecKeyInternal.h */,
                                18AD563F14CB6EB9008233F2 /* SecKeyPriv.h */,
                                18AD563E14CB6EB9008233F2 /* SecKeyInternal.h */,
                                18AD563F14CB6EB9008233F2 /* SecKeyPriv.h */,
+                               E795C94119116EA200FA068C /* SecLogging.c */,
+                               E795C94319116ECA00FA068C /* SecLogging.h */,
+                               52D0F026169CA72800F07D79 /* SecOnOSX.h */,
+                               4A971682158FDEB800D439B7 /* SecOTR.h */,
+                               4A971683158FDEB800D439B7 /* SecOTRDHKey.c */,
+                               4A971684158FDEB800D439B7 /* SecOTRDHKey.h */,
+                               4A971685158FDEB800D439B7 /* SecOTRErrors.h */,
+                               4A971686158FDEB800D439B7 /* SecOTRFullIdentity.c */,
+                               4A971687158FDEB800D439B7 /* SecOTRIdentityPriv.h */,
+                               4A971688158FDEB800D439B7 /* SecOTRMath.c */,
+                               4A971689158FDEB800D439B7 /* SecOTRMath.h */,
+                               4A97168B158FDEB800D439B7 /* SecOTRPacketData.c */,
+                               4A97168C158FDEB800D439B7 /* SecOTRPacketData.h */,
+                               4A97168D158FDEB800D439B7 /* SecOTRPackets.c */,
+                               4A97168E158FDEB800D439B7 /* SecOTRPackets.h */,
+                               4A97168F158FDEB800D439B7 /* SecOTRPublicIdentity.c */,
+                               4A971690158FDEB800D439B7 /* SecOTRSession.c */,
+                               4A971691158FDEB800D439B7 /* SecOTRSession.h */,
+                               4A971692158FDEB800D439B7 /* SecOTRSessionAKE.c */,
+                               4A971693158FDEB800D439B7 /* SecOTRSessionPriv.h */,
+                               4A971694158FDEB800D439B7 /* SecOTRUtils.c */,
                                CDC765C01729A72800721712 /* SecPasswordGenerate.c */,
                                CDC765C11729A72800721712 /* SecPasswordGenerate.h */,
                                18AD564014CB6EB9008233F2 /* SecPBKDF.c */,
                                18AD564114CB6EB9008233F2 /* SecPBKDF.h */,
                                18AD564214CB6EB9008233F2 /* SecPolicy.c */,
                                CDC765C01729A72800721712 /* SecPasswordGenerate.c */,
                                CDC765C11729A72800721712 /* SecPasswordGenerate.h */,
                                18AD564014CB6EB9008233F2 /* SecPBKDF.c */,
                                18AD564114CB6EB9008233F2 /* SecPBKDF.h */,
                                18AD564214CB6EB9008233F2 /* SecPolicy.c */,
+                               D48C567C1C73E5C300E41928 /* SecPolicyLeafCallbacks.c */,
                                18AD564314CB6EB9008233F2 /* SecPolicy.h */,
                                BE556A5D19550E1600E6EE8C /* SecPolicyCerts.h */,
                                18AD564414CB6EB9008233F2 /* SecPolicyInternal.h */,
                                18AD564314CB6EB9008233F2 /* SecPolicy.h */,
                                BE556A5D19550E1600E6EE8C /* SecPolicyCerts.h */,
                                18AD564414CB6EB9008233F2 /* SecPolicyInternal.h */,
@@ -1409,27 +1424,24 @@
                                18AD564B14CB6EB9008233F2 /* SecSCEP.h */,
                                E795C9531913F88D00FA068C /* SecServerEncryptionSupport.c */,
                                E795C9521913112F00FA068C /* SecServerEncryptionSupport.h */,
                                18AD564B14CB6EB9008233F2 /* SecSCEP.h */,
                                E795C9531913F88D00FA068C /* SecServerEncryptionSupport.c */,
                                E795C9521913112F00FA068C /* SecServerEncryptionSupport.h */,
+                               BE642BB1188F32C200C899A2 /* SecSharedCredential.c */,
+                               BE642BAF188F32AD00C899A2 /* SecSharedCredential.h */,
+                               BE4AC7DC1C938698002A28FE /* SecSignatureVerificationSupport.c */,
+                               BE4AC7DD1C938698002A28FE /* SecSignatureVerificationSupport.h */,
                                18AD564C14CB6EB9008233F2 /* SecTrust.c */,
                                18AD564D14CB6EB9008233F2 /* SecTrust.h */,
                                18AD564C14CB6EB9008233F2 /* SecTrust.c */,
                                18AD564D14CB6EB9008233F2 /* SecTrust.h */,
-                               18AD564E14CB6EB9008233F2 /* SecTrustPriv.h */,
                                BE8D22C11ABB9B6E009A4E18 /* SecTrustInternal.h */,
                                BE8D22C11ABB9B6E009A4E18 /* SecTrustInternal.h */,
+                               18AD564E14CB6EB9008233F2 /* SecTrustPriv.h */,
                                18AD564F14CB6EB9008233F2 /* SecTrustSettings.c */,
                                18AD565014CB6EB9008233F2 /* SecTrustSettings.h */,
                                18AD565114CB6EB9008233F2 /* SecTrustSettingsPriv.h */,
                                18AD565214CB6EB9008233F2 /* SecTrustStore.c */,
                                18AD565314CB6EB9008233F2 /* SecTrustStore.h */,
                                18AD564F14CB6EB9008233F2 /* SecTrustSettings.c */,
                                18AD565014CB6EB9008233F2 /* SecTrustSettings.h */,
                                18AD565114CB6EB9008233F2 /* SecTrustSettingsPriv.h */,
                                18AD565214CB6EB9008233F2 /* SecTrustStore.c */,
                                18AD565314CB6EB9008233F2 /* SecTrustStore.h */,
-                               BE642BB1188F32C200C899A2 /* SecSharedCredential.c */,
-                               BE642BAF188F32AD00C899A2 /* SecSharedCredential.h */,
                                18AD565414CB6EB9008233F2 /* Security.h */,
                                18AD565414CB6EB9008233F2 /* Security.h */,
-                               18AD565514CB6EB9008233F2 /* vmdh.c */,
-                               18AD565614CB6EB9008233F2 /* vmdh.h */,
                                E7B01B8816572579000485F1 /* SecuritydXPC.c */,
                                E7B01B8A1657259F000485F1 /* SecuritydXPC.h */,
                                E7B01B8816572579000485F1 /* SecuritydXPC.c */,
                                E7B01B8A1657259F000485F1 /* SecuritydXPC.h */,
-                               724D7363177A13A500FA10A1 /* AppleBaselineEscrowCertificates.h */,
-                               E7B00701170B58BD00B27966 /* SecExports.exp-in */,
-                               44B2606C18F82631008DF20F /* SecAccessControlExports.exp-in */,
-                               E795C94119116EA200FA068C /* SecLogging.c */,
-                               E795C94319116ECA00FA068C /* SecLogging.h */,
+                               18AD565514CB6EB9008233F2 /* vmdh.c */,
+                               18AD565614CB6EB9008233F2 /* vmdh.h */,
                        );
                        path = Security;
                        sourceTree = "<group>";
                        );
                        path = Security;
                        sourceTree = "<group>";
@@ -1445,6 +1457,10 @@
                                72E2DC0716BC47C800E7B236 /* OTATrustUtilities.h */,
                                18AD568214CB865E008233F2 /* policytree.c */,
                                18AD568314CB865E008233F2 /* policytree.h */,
                                72E2DC0716BC47C800E7B236 /* OTATrustUtilities.h */,
                                18AD568214CB865E008233F2 /* policytree.c */,
                                18AD568314CB865E008233F2 /* policytree.h */,
+                               D4273AA21B5D54CA0007D67B /* nameconstraints.c */,
+                               D4273AA31B5D54CA0007D67B /* nameconstraints.h */,
+                               D474EF321C8A1CBB00AA4D86 /* personalization.c */,
+                               D474EF331C8A1CBB00AA4D86 /* personalization.h */,
                                18AD568414CB865E008233F2 /* SecCAIssuerCache.c */,
                                18AD568514CB865E008233F2 /* SecCAIssuerCache.h */,
                                18AD568614CB865E008233F2 /* SecCAIssuerRequest.c */,
                                18AD568414CB865E008233F2 /* SecCAIssuerCache.c */,
                                18AD568514CB865E008233F2 /* SecCAIssuerCache.h */,
                                18AD568614CB865E008233F2 /* SecCAIssuerRequest.c */,
@@ -1489,8 +1505,6 @@
                                72B5923C17C6939A00AE738B /* iCloudTrace.c */,
                                5356520218E3C71000C383C0 /* SecOTRRemote.c */,
                                5356520418E3C88D00C383C0 /* SecOTRRemote.h */,
                                72B5923C17C6939A00AE738B /* iCloudTrace.c */,
                                5356520218E3C71000C383C0 /* SecOTRRemote.c */,
                                5356520418E3C88D00C383C0 /* SecOTRRemote.h */,
-                               D4273AA21B5D54CA0007D67B /* nameconstraints.c */,
-                               D4273AA31B5D54CA0007D67B /* nameconstraints.h */,
                        );
                        path = securityd;
                        sourceTree = "<group>";
                        );
                        path = securityd;
                        sourceTree = "<group>";
@@ -1499,6 +1513,7 @@
                        isa = PBXGroup;
                        children = (
                                4CC92AB015A3AD0000C6D578 /* Security_regressions.h */,
                        isa = PBXGroup;
                        children = (
                                4CC92AB015A3AD0000C6D578 /* Security_regressions.h */,
+                               D40771B21C9B4CE50016AA66 /* shared_regressions.h */,
                                4CC92A0E15A3ABD400C6D578 /* crypto */,
                                4CC92A1115A3ABD400C6D578 /* otr */,
                                4CC92A1615A3ABD400C6D578 /* secitem */,
                                4CC92A0E15A3ABD400C6D578 /* crypto */,
                                4CC92A1115A3ABD400C6D578 /* otr */,
                                4CC92A1615A3ABD400C6D578 /* secitem */,
@@ -1543,29 +1558,26 @@
                                4C2C8C3C17AB374700C24C13 /* si-12-item-stress.c */,
                                EB9C1D091BDDBDD500F89272 /* si-13-item-system.m */,
                                4CC92A1B15A3ABD400C6D578 /* si-14-dateparse.c */,
                                4C2C8C3C17AB374700C24C13 /* si-12-item-stress.c */,
                                EB9C1D091BDDBDD500F89272 /* si-13-item-system.m */,
                                4CC92A1B15A3ABD400C6D578 /* si-14-dateparse.c */,
+                               EBD3447F1D234E26008B6DEA /* si-15-delete-access-group.m */,
                                4CC92A1C15A3ABD400C6D578 /* si-15-certificate.c */,
                                4CC92A1D15A3ABD400C6D578 /* si-16-ec-certificate.c */,
                                E7EF51911C24C6E3002D0C23 /* si-17-item-system-bluetooth.m */,
                                4CC92A1C15A3ABD400C6D578 /* si-15-certificate.c */,
                                4CC92A1D15A3ABD400C6D578 /* si-16-ec-certificate.c */,
                                E7EF51911C24C6E3002D0C23 /* si-17-item-system-bluetooth.m */,
-                               4CC92A1E15A3ABD400C6D578 /* si-20-sectrust-activation.c */,
+                               D4EC94D31CEA47D70083E753 /* si-20-sectrust-policies.m */,
                                4CC92A1F15A3ABD400C6D578 /* si-20-sectrust.c */,
                                BE3171921BB3559600BBB212 /* si-20-sectrust.h */,
                                4CC92A2015A3ABD400C6D578 /* si-21-sectrust-asr.c */,
                                4CC92A2115A3ABD400C6D578 /* si-22-sectrust-iap.c */,
                                4CC92A1F15A3ABD400C6D578 /* si-20-sectrust.c */,
                                BE3171921BB3559600BBB212 /* si-20-sectrust.h */,
                                4CC92A2015A3ABD400C6D578 /* si-21-sectrust-asr.c */,
                                4CC92A2115A3ABD400C6D578 /* si-22-sectrust-iap.c */,
+                               D44216091CCAD9C200D2D455 /* si-22-sectrust-iap.h */,
                                4CC92A2215A3ABD400C6D578 /* si-23-sectrust-ocsp.c */,
                                4CC92A2215A3ABD400C6D578 /* si-23-sectrust-ocsp.c */,
-                               4CC92A2315A3ABD400C6D578 /* si-24-sectrust-appleid.c */,
                                4CC92A2415A3ABD400C6D578 /* si-24-sectrust-digicert-malaysia.c */,
                                4CC92A2515A3ABD400C6D578 /* si-24-sectrust-diginotar.c */,
                                4CC92A2615A3ABD400C6D578 /* si-24-sectrust-itms.c */,
                                4CC92A2415A3ABD400C6D578 /* si-24-sectrust-digicert-malaysia.c */,
                                4CC92A2515A3ABD400C6D578 /* si-24-sectrust-diginotar.c */,
                                4CC92A2615A3ABD400C6D578 /* si-24-sectrust-itms.c */,
-                               4CC92A2715A3ABD400C6D578 /* si-24-sectrust-mobileasset.c */,
                                4CC92A2815A3ABD400C6D578 /* si-24-sectrust-nist.c */,
                                4CC92A2815A3ABD400C6D578 /* si-24-sectrust-nist.c */,
-                               4CC92A2915A3ABD400C6D578 /* si-24-sectrust-otatasking.c */,
-                               4CC92A2A15A3ABD400C6D578 /* si-24-sectrust-shoebox.c */,
-                               4CC92A2B15A3ABD400C6D578 /* si-25-sectrust-ipsec-eap.c */,
-                               EB8F48DC1AE4C81400CE93A7 /* si-25-sectrust-apple-authentication.c */,
-                               4CC92A2C15A3ABD400C6D578 /* si-26-applicationsigning.c */,
+                               4CC92A2A15A3ABD400C6D578 /* si-24-sectrust-passbook.c */,
+                               4CC92A2C15A3ABD400C6D578 /* si-26-sectrust-copyproperties.c */,
                                4CC92A2D15A3ABD400C6D578 /* si-27-sectrust-exceptions.c */,
                                4CC92A2D15A3ABD400C6D578 /* si-27-sectrust-exceptions.c */,
-                               4CC92A2E15A3ABD400C6D578 /* si-28-sectrustsettings.c */,
-                               4CC92A2F15A3ABD400C6D578 /* si-29-sectrust-codesigning.c */,
+                               4CC92A2E15A3ABD400C6D578 /* si-28-sectrustsettings.m */,
+                               D4653DEA1C9E2299002ED6D5 /* si-28-sectrustsettings.h */,
                                4CC92A3015A3ABD400C6D578 /* si-30-keychain-upgrade.c */,
                                4CC92A3115A3ABD400C6D578 /* si-31-keychain-bad.c */,
                                4CC92A3215A3ABD400C6D578 /* si-31-keychain-unreadable.c */,
                                4CC92A3015A3ABD400C6D578 /* si-30-keychain-upgrade.c */,
                                4CC92A3115A3ABD400C6D578 /* si-31-keychain-bad.c */,
                                4CC92A3215A3ABD400C6D578 /* si-31-keychain-unreadable.c */,
@@ -1575,6 +1587,10 @@
                                4CC92A3715A3ABD400C6D578 /* si-41-sececkey.c */,
                                4CC92A3815A3ABD400C6D578 /* si-42-identity.c */,
                                4CC92A3915A3ABD400C6D578 /* si-43-persistent.c */,
                                4CC92A3715A3ABD400C6D578 /* si-41-sececkey.c */,
                                4CC92A3815A3ABD400C6D578 /* si-42-identity.c */,
                                4CC92A3915A3ABD400C6D578 /* si-43-persistent.c */,
+                               09D1FC1D1CDCBA8800A82D0D /* si-44-seckey-gen.m */,
+                               09EC947E1CEDEA70003E5101 /* si-44-seckey-rsa.m */,
+                               0982E02B1D19695B0060002E /* si-44-seckey-ec.m */,
+                               09AE116D1CEDA17A004C617D /* si-44-seckey-ies.m */,
                                4CC92A3A15A3ABD400C6D578 /* si-50-secrandom.c */,
                                4CC92A3B15A3ABD400C6D578 /* si-60-cms.c */,
                                4CC92A3C15A3ABD400C6D578 /* si-61-pkcs12.c */,
                                4CC92A3A15A3ABD400C6D578 /* si-50-secrandom.c */,
                                4CC92A3B15A3ABD400C6D578 /* si-60-cms.c */,
                                4CC92A3C15A3ABD400C6D578 /* si-61-pkcs12.c */,
@@ -1596,30 +1612,25 @@
                                BE62D75F1747FF3E001EAA9D /* si-72-syncableitems.c */,
                                CDD565A1173193AC00B6B074 /* si-73-secpasswordgenerate.c */,
                                7255A46B1783333D006A8B9A /* si-74-OTAPKISigner.c */,
                                BE62D75F1747FF3E001EAA9D /* si-72-syncableitems.c */,
                                CDD565A1173193AC00B6B074 /* si-73-secpasswordgenerate.c */,
                                7255A46B1783333D006A8B9A /* si-74-OTAPKISigner.c */,
-                               7255F91317A973D5004A9F38 /* si-75-AppleIDRecordSigning.c */,
                                BE061FCE1899E5BD00C739F6 /* si-76-shared-credentials.c */,
                                3A70988118CDF648009FD2CC /* si_77_SecAccessControl.c */,
                                4477A8D718F28AAE00B5BB9F /* si-78-query-attrs.c */,
                                BE061FCE1899E5BD00C739F6 /* si-76-shared-credentials.c */,
                                3A70988118CDF648009FD2CC /* si_77_SecAccessControl.c */,
                                4477A8D718F28AAE00B5BB9F /* si-78-query-attrs.c */,
-                               7DE2092F192D29D90066419C /* si-79-smp-cert-policy.c */,
                                4406660E19069707000DA171 /* si-80-empty-data.c */,
                                4406660E19069707000DA171 /* si-80-empty-data.c */,
-                               BE794825196DBEAD00F4BA63 /* si-81-sectrust-server-auth.c */,
+                               D40771AB1C9B4C530016AA66 /* si-82-seccertificate-ct.c */,
+                               D40771AC1C9B4C530016AA66 /* si-82-sectrust-ct.m */,
+                               440BF8F41A7A7EC9001760A7 /* si-82-token-ag.c */,
                                BE0CC6061A96B68400662E69 /* si-83-seccertificate-sighashalg.c */,
                                BE0CC6061A96B68400662E69 /* si-83-seccertificate-sighashalg.c */,
-                               F953A6A71B43538A006EC5E1 /* si-81-sectrust-appletv.c */,
-                               D445CDDF1B44D372005040AC /* si-84-sectrust-atv-appsigning.c */,
                                D4B4A9A61B8801960097B393 /* si-85-sectrust-ssl-policy.c */,
                                D4B4A9A61B8801960097B393 /* si-85-sectrust-ssl-policy.c */,
-                               BECC54E31B98FF0000FB91DC /* si-86-sectrust-eap-tls.c */,
-                               BECC54E41B98FF0000FB91DC /* si-86-sectrust-eap-tls.h */,
+                               D4C6E1681B9A0AE800E42591 /* si-85-sectrust-ssl-policy.h */,
                                D4DFC9481B9958D00040945C /* si-87-sectrust-name-constraints.c */,
                                D4DFC9491B9958D00040945C /* si-87-sectrust-name-constraints.h */,
                                D4DFC9481B9958D00040945C /* si-87-sectrust-name-constraints.c */,
                                D4DFC9491B9958D00040945C /* si-87-sectrust-name-constraints.h */,
-                               858A54641BC6FD3E008A03FA /* si-88-sectrust-vpnprofile.c */,
-                               858A54651BC6FD3E008A03FA /* si-88-sectrust-vpnprofile.h */,
                                D4CBC1461BE9A89E00C5795E /* si-89-cms-hash-agility.c */,
                                D4CBC1471BE9A89E00C5795E /* si-89-cms-hash-agility.h */,
                                EB69AB051BF425F300913AF1 /* si-90-emcs.m */,
                                D4CBC1461BE9A89E00C5795E /* si-89-cms-hash-agility.c */,
                                D4CBC1471BE9A89E00C5795E /* si-89-cms-hash-agility.h */,
                                EB69AB051BF425F300913AF1 /* si-90-emcs.m */,
-                               D40294A71C20A806008CE4B6 /* si-91-sectrust-ast2.c */,
-                               D40294A81C20A806008CE4B6 /* si-91-sectrust-ast2.h */,
-                               D41380C71C6E529500F1A4B6 /* si-92-sectrust-homekit.c */,
-                               D41380C81C6E529500F1A4B6 /* si-92-sectrust-homekit.h */,
+                               D4A919751CA9A3DD003D2ADA /* si-95-cms-basic.c */,
+                               D4A919761CA9A3DD003D2ADA /* si-95-cms-basic.h */,
+                               D44C81E71CD1944C00BE9A0D /* si-97-sectrust-path-scoring.m */,
+                               D44C81E91CD1947200BE9A0D /* si-97-sectrust-path-scoring.h */,
                        );
                        name = secitem;
                        path = Regressions/secitem;
                        );
                        name = secitem;
                        path = Regressions/secitem;
@@ -1702,7 +1713,7 @@
                                0C062B1D175E784B00806CFE /* secd-31-keychain-bad.c */,
                                0C062B1E175E784B00806CFE /* secd-31-keychain-unreadable.c */,
                                446CEEE319B6043900ECAF50 /* secd-32-restore-bad-backup.c */,
                                0C062B1D175E784B00806CFE /* secd-31-keychain-bad.c */,
                                0C062B1E175E784B00806CFE /* secd-31-keychain-unreadable.c */,
                                446CEEE319B6043900ECAF50 /* secd-32-restore-bad-backup.c */,
-                               4469FC2A1AA0A69E0021AA26 /* secd-33-keychain-ctk.c */,
+                               4469FC2A1AA0A69E0021AA26 /* secd-33-keychain-ctk.m */,
                                529F46F11AEC759E0002392C /* secd-34-backup-der-parse.c */,
                                4483050D1B46FB6C00326450 /* secd-35-keychain-migrate-inet.c */,
                                E75AB9191AE9958300C5EF3F /* secd-40-cc-gestalt.c */,
                                529F46F11AEC759E0002392C /* secd-34-backup-der-parse.c */,
                                4483050D1B46FB6C00326450 /* secd-35-keychain-migrate-inet.c */,
                                E75AB9191AE9958300C5EF3F /* secd-40-cc-gestalt.c */,
@@ -1716,6 +1727,7 @@
                                E7F0D3E9177BBE35001ACBC1 /* secd-55-account-incompatibility.c */,
                                E7F18556177A502900177B23 /* secd-56-account-apply.c */,
                                E7A10FAD1771249C00C4602F /* secd-57-account-leave.c */,
                                E7F0D3E9177BBE35001ACBC1 /* secd-55-account-incompatibility.c */,
                                E7F18556177A502900177B23 /* secd-56-account-apply.c */,
                                E7A10FAD1771249C00C4602F /* secd-57-account-leave.c */,
+                               4826374C1CC18A410082C9C8 /* secd-57-1-account-last-standing.c */,
                                4882C516177521AE0095D04B /* secd-58-password-change.c */,
                                48F32D7D1777AFA3001B84BA /* secd-59-account-cleanup.c */,
                                E7F18554177A44E000177B23 /* secd-60-account-cloud-identity.c */,
                                4882C516177521AE0095D04B /* secd-58-password-change.c */,
                                48F32D7D1777AFA3001B84BA /* secd-59-account-cleanup.c */,
                                E7F18554177A44E000177B23 /* secd-60-account-cloud-identity.c */,
@@ -1730,16 +1742,27 @@
                                4C495EE01982171500BC1809 /* secd-70-engine-corrupt.c */,
                                F9EF72F01AC0F97C00A4D24A /* secd-70-engine-smash.c */,
                                5384299318E492A300E91AFE /* secd-70-otr-remote.c */,
                                4C495EE01982171500BC1809 /* secd-70-engine-corrupt.c */,
                                F9EF72F01AC0F97C00A4D24A /* secd-70-engine-smash.c */,
                                5384299318E492A300E91AFE /* secd-70-otr-remote.c */,
+                               5221C4971CBEDB7C006047E7 /* secd-71-engine-save.c */,
+                               5221C4C11CC5667E006047E7 /* secd-71-engine-save-sample1.h */,
                                4CCD1B001B1E3EA200F6DF8D /* secd-74-engine-beer-servers.c */,
                                4CC62F201B4C63FE009FEF0E /* secd-75-engine-views.c */,
                                4CCD1B001B1E3EA200F6DF8D /* secd-74-engine-beer-servers.c */,
                                4CC62F201B4C63FE009FEF0E /* secd-75-engine-views.c */,
+                               0C60F39B1CAF0E8E00221D24 /* secd-76-idstransport.c */,
+                               0C3276C21CB329AB005D6DDC /* secd_77_ids_messaging.c */,
                                48FB17041A77181A00B586C7 /* secd-80-views-basic.c */,
                                485B5E611AE068D800A3C183 /* secd-82-secproperties-basic.c */,
                                5E19C6471AA5F34E005964F8 /* secd-81-item-acl-stress.c */,
                                5EA016361AD41AB20061BCD7 /* secd-81-item-acl.c */,
                                F9E0BD981AEF196A00554D49 /* secd-82-persistent-ref.c */,
                                48FB17041A77181A00B586C7 /* secd-80-views-basic.c */,
                                485B5E611AE068D800A3C183 /* secd-82-secproperties-basic.c */,
                                5E19C6471AA5F34E005964F8 /* secd-81-item-acl-stress.c */,
                                5EA016361AD41AB20061BCD7 /* secd-81-item-acl.c */,
                                F9E0BD981AEF196A00554D49 /* secd-82-persistent-ref.c */,
+                               5EF2596E1CB5214B009B4C58 /* secd-83-item-match-policy.m */,
+                               5E0CE1641CB6347300E75776 /* secd-83-item-match-valid-on-date.m */,
+                               5E0CE1661CB6348D00E75776 /* secd-83-item-match-trusted.m */,
+                               5E0CE1681CB64A1300E75776 /* secd-83-item-match.h */,
                                48FABEE01AD05C7100C061D1 /* secd-90-hsa2.c */,
                                CD8F442C1B83C435004C0047 /* secd-95-escrow-persistence.c */,
                                48FABEE01AD05C7100C061D1 /* secd-90-hsa2.c */,
                                CD8F442C1B83C435004C0047 /* secd-95-escrow-persistence.c */,
+                               CD9B54111CC6EC4D00CC487A /* secd-100-initialsync.c */,
+                               E739A9DC1D318FA4003C088A /* secd-130-other-peer-views.c */,
                                CD35B8291C2650FE00E0852A /* secd-154-engine-backoff.c */,
                                CD35B8291C2650FE00E0852A /* secd-154-engine-backoff.c */,
+                               48B5888B1D00ED9000E0C5A7 /* secd-200-logstate.c */,
                                E7A10FAA1771245D00C4602F /* SOSAccountTesting.h */,
                                E79D62BE1767A547005A9743 /* SecdTestKeychainUtilities.c */,
                                E79D62BF1767A55F005A9743 /* SecdTestKeychainUtilities.h */,
                                E7A10FAA1771245D00C4602F /* SOSAccountTesting.h */,
                                E79D62BE1767A547005A9743 /* SecdTestKeychainUtilities.c */,
                                E79D62BF1767A55F005A9743 /* SecdTestKeychainUtilities.h */,
@@ -1766,51 +1789,6 @@
                        name = Frameworks;
                        sourceTree = "<group>";
                };
                        name = Frameworks;
                        sourceTree = "<group>";
                };
-               521C0B9B15FA5C4A00604B61 /* Supporting Files */ = {
-                       isa = PBXGroup;
-                       children = (
-                       );
-                       name = "Supporting Files";
-                       sourceTree = "<group>";
-               };
-               521C0BAB15FA5DA800604B61 /* en.lproj */ = {
-                       isa = PBXGroup;
-                       children = (
-                               521C0BAC15FA5DA800604B61 /* InfoPlist.strings */,
-                       );
-                       name = en.lproj;
-                       path = SOSCircle/CloudKeychainProxy/en.lproj;
-                       sourceTree = SOURCE_ROOT;
-               };
-               5272501416838BB20029AADD /* CloudKeychainProxy */ = {
-                       isa = PBXGroup;
-                       children = (
-                               521C0BAF15FA5E3F00604B61 /* CKDKVSProxy.h */,
-                               521C0BB015FA5E3F00604B61 /* CKDKVSProxy.m */,
-                               52C3D18E169A53150091D9D3 /* ckdmain.m */,
-                               521C0BB115FA5E3F00604B61 /* CKDPersistentState.h */,
-                               521C0BB215FA5E3F00604B61 /* CKDPersistentState.m */,
-                               52840291164050C80035F320 /* CKDUserInteraction.h */,
-                               52840292164050C80035F320 /* CKDUserInteraction.m */,
-                               521C0BA615FA5D7400604B61 /* cloudkeychain.entitlements.plist */,
-                               5272501916838BB20029AADD /* CloudKeychainProxy.1 */,
-                               521C0BB315FA5E3F00604B61 /* cloudkeychainproxy.m */,
-                               521C0BAB15FA5DA800604B61 /* en.lproj */,
-                               522B0ED31649A68E00A4675D /* MobileKeyBag.framework */,
-                               521C0B9B15FA5C4A00604B61 /* Supporting Files */,
-                               5272501716838BB20029AADD /* Supporting Files */,
-                       );
-                       name = CloudKeychainProxy;
-                       path = ../CloudKeychainProxy;
-                       sourceTree = "<group>";
-               };
-               5272501716838BB20029AADD /* Supporting Files */ = {
-                       isa = PBXGroup;
-                       children = (
-                       );
-                       name = "Supporting Files";
-                       sourceTree = "<group>";
-               };
                BEF9640718B417EB00813FA3 /* SharedWebCredentialAgent */ = {
                        isa = PBXGroup;
                        children = (
                BEF9640718B417EB00813FA3 /* SharedWebCredentialAgent */ = {
                        isa = PBXGroup;
                        children = (
@@ -1821,20 +1799,6 @@
                        name = SharedWebCredentialAgent;
                        sourceTree = "<group>";
                };
                        name = SharedWebCredentialAgent;
                        sourceTree = "<group>";
                };
-               CD5D34001A80391B00EBF353 /* IDSKeychainSyncingProxy */ = {
-                       isa = PBXGroup;
-                       children = (
-                               CDF42C061A884BB10080BB05 /* idksmain.m */,
-                               CD5D34011A80391B00EBF353 /* IDSProxy.h */,
-                               CD5D34021A80391B00EBF353 /* IDSProxy.m */,
-                               CD5D34041A80391B00EBF353 /* idskeychainsyncingproxy.entitlements.plist */,
-                               CD5D34051A80391B00EBF353 /* idskeychainsyncingproxy.m */,
-                               CDD4500F1ACF134A00A37449 /* IDSPersistentState.h */,
-                               CDD450101ACF13BC00A37449 /* IDSPersistentState.m */,
-                       );
-                       path = IDSKeychainSyncingProxy;
-                       sourceTree = "<group>";
-               };
                E71049F4169E023B00DB0045 /* SecurityTool */ = {
                        isa = PBXGroup;
                        children = (
                E71049F4169E023B00DB0045 /* SecurityTool */ = {
                        isa = PBXGroup;
                        children = (
@@ -1883,26 +1847,16 @@
                                521C685D1614A6E100E31C3E /* SOSCloudKeychainClient.h */,
                                E7217B2515F8131A00D26031 /* SOSCloudKeychainConstants.c */,
                                E7217B2615F8131A00D26031 /* SOSCloudKeychainConstants.h */,
                                521C685D1614A6E100E31C3E /* SOSCloudKeychainClient.h */,
                                E7217B2515F8131A00D26031 /* SOSCloudKeychainConstants.c */,
                                E7217B2615F8131A00D26031 /* SOSCloudKeychainConstants.h */,
+                               481A954F1D1A02AA000B98F5 /* SOSCloudKeychainLogging.c */,
+                               481A95501D1A02AA000B98F5 /* SOSCloudKeychainLogging.h */,
                        );
                        path = CKBridge;
                        sourceTree = "<group>";
                };
                        );
                        path = CKBridge;
                        sourceTree = "<group>";
                };
-               E7295C6614E356FE007FBB20 /* Hacks */ = {
-                       isa = PBXGroup;
-                       children = (
-                               E7295C6714E3571A007FBB20 /* Empty.c */,
-                               4C8940DA166EA8CF00241770 /* osxshim.c */,
-                       );
-                       name = Hacks;
-                       sourceTree = "<group>";
-               };
                E7AC69CE14E1F78400CB09C1 /* SOSCircle */ = {
                        isa = PBXGroup;
                        children = (
                                E7217B2015F8126700D26031 /* CKBridge */,
                E7AC69CE14E1F78400CB09C1 /* SOSCircle */ = {
                        isa = PBXGroup;
                        children = (
                                E7217B2015F8126700D26031 /* CKBridge */,
-                               5272501416838BB20029AADD /* CloudKeychainProxy */,
-                               E7295C6614E356FE007FBB20 /* Hacks */,
-                               CD5D34001A80391B00EBF353 /* IDSKeychainSyncingProxy */,
                                E7AC69CF14E1F78400CB09C1 /* Regressions */,
                                E7AC69D114E1F78400CB09C1 /* SecureObjectSync */,
                                E7FEFB81169E362100E18152 /* Tool */,
                                E7AC69CF14E1F78400CB09C1 /* Regressions */,
                                E7AC69D114E1F78400CB09C1 /* SecureObjectSync */,
                                E7FEFB81169E362100E18152 /* Tool */,
@@ -1913,8 +1867,6 @@
                E7AC69CF14E1F78400CB09C1 /* Regressions */ = {
                        isa = PBXGroup;
                        children = (
                E7AC69CF14E1F78400CB09C1 /* Regressions */ = {
                        isa = PBXGroup;
                        children = (
-                               521C0CD915FFA05000604B61 /* CKDKeyValueStore.h */,
-                               521C0CDA15FFA05000604B61 /* CKDKeyValueStore.m */,
                                E763D6221624E2670038477D /* sc-20-keynames.c */,
                                48487D271B1D5E960078C7C9 /* sc-25-soskeygen.c */,
                                E777C72815B9C9F0004044A8 /* sc-30-peerinfo.c */,
                                E763D6221624E2670038477D /* sc-20-keynames.c */,
                                48487D271B1D5E960078C7C9 /* sc-25-soskeygen.c */,
                                E777C72815B9C9F0004044A8 /* sc-30-peerinfo.c */,
@@ -1952,8 +1904,6 @@
                                E7217B1715F80E0F00D26031 /* SOSCloudCircle.c */,
                                E703811114E1FEE4007CB458 /* SOSCloudCircle.h */,
                                E7B01B5A16532507000485F1 /* SOSCloudCircleInternal.h */,
                                E7217B1715F80E0F00D26031 /* SOSCloudCircle.c */,
                                E703811114E1FEE4007CB458 /* SOSCloudCircle.h */,
                                E7B01B5A16532507000485F1 /* SOSCloudCircleInternal.h */,
-                               4BD2F7FB1ADCDD8C0037CD5D /* SOSForerunnerSession.c */,
-                               4BD2F7FC1ADCDD8C0037CD5D /* SOSForerunnerSession.h */,
                                48E9CDFB1C597FED00574D6B /* SOSSysdiagnose.c */,
                                E777C71D15B73F9E004044A8 /* SOSInternal.c */,
                                E777C71B15B73F59004044A8 /* SOSInternal.h */,
                                48E9CDFB1C597FED00574D6B /* SOSSysdiagnose.c */,
                                E777C71D15B73F9E004044A8 /* SOSInternal.c */,
                                E777C71B15B73F59004044A8 /* SOSInternal.h */,
@@ -1968,6 +1918,8 @@
                        children = (
                                4CC929AD15A3957800C6D578 /* SOSAccount.c */,
                                4CC929AE15A3957800C6D578 /* SOSAccount.h */,
                        children = (
                                4CC929AD15A3957800C6D578 /* SOSAccount.c */,
                                4CC929AE15A3957800C6D578 /* SOSAccount.h */,
+                               48FD04F11CEFCFB900BEBBFF /* SOSAccountTransaction.c */,
+                               48FD04F21CEFCFB900BEBBFF /* SOSAccountTransaction.h */,
                                E7C4F5451AD75EBE000B5862 /* SOSAccountBackup.c */,
                                48764AF417FA3FE50005C4F1 /* SOSAccountCircles.c */,
                                48FABEDB1AD05C1D00C061D1 /* SOSAccountHSAJoin.c */,
                                E7C4F5451AD75EBE000B5862 /* SOSAccountBackup.c */,
                                48764AF417FA3FE50005C4F1 /* SOSAccountCircles.c */,
                                48FABEDB1AD05C1D00C061D1 /* SOSAccountHSAJoin.c */,
@@ -1978,10 +1930,13 @@
                                48C7DF9717FF360F00904F1A /* SOSAccountFullPeerInfo.c */,
                                48C7DF9517FF351A00904F1A /* SOSAccountPeers.c */,
                                48764AEB17FA31E50005C4F1 /* SOSAccountPersistence.c */,
                                48C7DF9717FF360F00904F1A /* SOSAccountFullPeerInfo.c */,
                                48C7DF9517FF351A00904F1A /* SOSAccountPeers.c */,
                                48764AEB17FA31E50005C4F1 /* SOSAccountPersistence.c */,
+                               48122CC71CFF88DC009BE3E3 /* SOSAccountLog.c */,
+                               48122CC81CFF88DC009BE3E3 /* SOSAccountLog.h */,
                                48764AEA17FA31670005C4F1 /* SOSAccountPriv.h */,
                                48764AEE17FA36200005C4F1 /* SOSAccountUpdate.c */,
                                CDC0DC941AE842640020BA6C /* SOSAccountRings.c */,
                                CDC0DC951AE842640020BA6C /* SOSAccountRingUpdate.c */,
                                48764AEA17FA31670005C4F1 /* SOSAccountPriv.h */,
                                48764AEE17FA36200005C4F1 /* SOSAccountUpdate.c */,
                                CDC0DC941AE842640020BA6C /* SOSAccountRings.c */,
                                CDC0DC951AE842640020BA6C /* SOSAccountRingUpdate.c */,
+                               E75320EB1D0B83FC00DAB140 /* SOSAccountViewSync.c */,
                                528462991AE6FCF0004C1BA2 /* SOSBackupEvent.c */,
                                5284629A1AE6FCF0004C1BA2 /* SOSBackupEvent.h */,
                                E71BAE801ACE1C6500DF0C29 /* SOSBackupSliceKeyBag.c */,
                                528462991AE6FCF0004C1BA2 /* SOSBackupEvent.c */,
                                5284629A1AE6FCF0004C1BA2 /* SOSBackupEvent.h */,
                                E71BAE801ACE1C6500DF0C29 /* SOSBackupSliceKeyBag.c */,
@@ -2048,6 +2003,8 @@
                                CDC0DC3B1AE83E390020BA6C /* SOSRingV0.h */,
                                48F7DF241A6DB32900046644 /* SOSViews.c */,
                                48F7DF251A6DB32900046644 /* SOSViews.h */,
                                CDC0DC3B1AE83E390020BA6C /* SOSRingV0.h */,
                                48F7DF241A6DB32900046644 /* SOSViews.c */,
                                48F7DF251A6DB32900046644 /* SOSViews.h */,
+                               4812D5A61CAF1FCB0041FAD8 /* ViewList.list */,
+                               4812D5A51CAF07060041FAD8 /* SOSViews.exp-in */,
                        );
                        name = Circle;
                        sourceTree = "<group>";
                        );
                        name = Circle;
                        sourceTree = "<group>";
@@ -2106,12 +2063,20 @@
                E7FEFB81169E362100E18152 /* Tool */ = {
                        isa = PBXGroup;
                        children = (
                E7FEFB81169E362100E18152 /* Tool */ = {
                        isa = PBXGroup;
                        children = (
+                               4899F2E81C768BBE00762615 /* secToolFileIO.h */,
+                               4899F2E71C768BBE00762615 /* secToolFileIO.c */,
+                               E78DCD671D306C9000DE7A88 /* NSFileHandle+Formatting.h */,
+                               E739A9DA1D3078D9003C088A /* NSFileHandle+Formatting.m */,
                                E790C0F4169E3D7200E0C0C9 /* keychain_sync.h */,
                                E7FEFB90169E36D800E18152 /* keychain_sync.c */,
                                E790C0F4169E3D7200E0C0C9 /* keychain_sync.h */,
                                E7FEFB90169E36D800E18152 /* keychain_sync.c */,
+                               E7ACD2FA1D30204E0038050D /* keychain_sync_test.h */,
+                               E7ACD2F91D30204E0038050D /* keychain_sync_test.m */,
                                48279BC41C57FEA20043457C /* keychain_log.h */,
                                48279BC31C57FEA20043457C /* keychain_log.c */,
                                48279BC41C57FEA20043457C /* keychain_log.h */,
                                48279BC31C57FEA20043457C /* keychain_log.c */,
-                               48FEA7771C52FFE70020C148 /* secToolFileIO.c */,
-                               48FEA7781C52FFE70020C148 /* secToolFileIO.h */,
+                               485FE6BD1CDBED5800C916C5 /* syncbackup.h */,
+                               485FE6BC1CDBED5800C916C5 /* syncbackup.c */,
+                               4838F6BB1CB5AA5F009E8598 /* secViewDisplay.c */,
+                               4838F6BC1CB5AA5F009E8598 /* secViewDisplay.h */,
                        );
                        path = Tool;
                        sourceTree = "<group>";
                        );
                        path = Tool;
                        sourceTree = "<group>";
@@ -2151,6 +2116,7 @@
                        buildActionMask = 2147483647;
                        files = (
                                18AD560F14CB6E7A008233F2 /* securityd_client.h in Headers */,
                        buildActionMask = 2147483647;
                        files = (
                                18AD560F14CB6E7A008233F2 /* securityd_client.h in Headers */,
+                               4868F41C1C7409EF0011825E /* SOSInternal.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -2158,15 +2124,20 @@
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               D4D9BA2E1C7E5F19008785EB /* SecTrustInternal.h in Headers */,
+                               4899F2EA1C768BBE00762615 /* secToolFileIO.h in Headers */,
                                CDC765C41729A72800721712 /* SecPasswordGenerate.h in Headers */,
                                4A971695158FDEB800D439B7 /* SecOTR.h in Headers */,
                                4A971697158FDEB800D439B7 /* SecOTRDHKey.h in Headers */,
                                4492652A1AB0D6FF00644D4C /* SecCTKKeyPriv.h in Headers */,
                                4A971698158FDEB800D439B7 /* SecOTRErrors.h in Headers */,
                                4A97169A158FDEB800D439B7 /* SecOTRIdentityPriv.h in Headers */,
                                CDC765C41729A72800721712 /* SecPasswordGenerate.h in Headers */,
                                4A971695158FDEB800D439B7 /* SecOTR.h in Headers */,
                                4A971697158FDEB800D439B7 /* SecOTRDHKey.h in Headers */,
                                4492652A1AB0D6FF00644D4C /* SecCTKKeyPriv.h in Headers */,
                                4A971698158FDEB800D439B7 /* SecOTRErrors.h in Headers */,
                                4A97169A158FDEB800D439B7 /* SecOTRIdentityPriv.h in Headers */,
+                               5221C4C21CC5667E006047E7 /* secd-71-engine-save-sample1.h in Headers */,
+                               D47F511F1C3B660500A7CEFE /* SecCFAllocator.h in Headers */,
                                4A97169C158FDEB800D439B7 /* SecOTRMath.h in Headers */,
                                4A97169F158FDEB800D439B7 /* SecOTRPacketData.h in Headers */,
                                4A9716A1158FDEB800D439B7 /* SecOTRPackets.h in Headers */,
                                4A97169C158FDEB800D439B7 /* SecOTRMath.h in Headers */,
                                4A97169F158FDEB800D439B7 /* SecOTRPacketData.h in Headers */,
                                4A9716A1158FDEB800D439B7 /* SecOTRPackets.h in Headers */,
+                               BE4AC7DF1C938698002A28FE /* SecSignatureVerificationSupport.h in Headers */,
                                4A9716A4158FDEB800D439B7 /* SecOTRSession.h in Headers */,
                                4A9716A6158FDEB800D439B7 /* SecOTRSessionPriv.h in Headers */,
                                52D0F028169CA72800F07D79 /* SecOnOSX.h in Headers */,
                                4A9716A4158FDEB800D439B7 /* SecOTRSession.h in Headers */,
                                4A9716A6158FDEB800D439B7 /* SecOTRSessionPriv.h in Headers */,
                                52D0F028169CA72800F07D79 /* SecOnOSX.h in Headers */,
@@ -2186,6 +2157,7 @@
                                E7285C981AE1E4A800AD412D /* SOSEngine.h in Headers */,
                                4C05608A17B60F88001A879A /* SecDbKeychainItem.h in Headers */,
                                4C05608B17B60F88001A879A /* SecDbQuery.h in Headers */,
                                E7285C981AE1E4A800AD412D /* SOSEngine.h in Headers */,
                                4C05608A17B60F88001A879A /* SecDbKeychainItem.h in Headers */,
                                4C05608B17B60F88001A879A /* SecDbQuery.h in Headers */,
+                               D474EF351C8A1CBC00AA4D86 /* personalization.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -2203,31 +2175,18 @@
                                4CC92AC015A3BC4300C6D578 /* Security_regressions.h in Headers */,
                                4CC92A8C15A3ABD400C6D578 /* getcacert-mdes.h in Headers */,
                                4CC92A8D15A3ABD400C6D578 /* getcacert-mdesqa.h in Headers */,
                                4CC92AC015A3BC4300C6D578 /* Security_regressions.h in Headers */,
                                4CC92A8C15A3ABD400C6D578 /* getcacert-mdes.h in Headers */,
                                4CC92A8D15A3ABD400C6D578 /* getcacert-mdesqa.h in Headers */,
-                               BE3171931BB3559600BBB212 /* si-20-sectrust.h in Headers */,
                                4CC92A8F15A3ABD400C6D578 /* si-63-scep.h in Headers */,
                                4CC92A8F15A3ABD400C6D578 /* si-63-scep.h in Headers */,
-                               D4DFC94B1B9958D00040945C /* si-87-sectrust-name-constraints.h in Headers */,
                                4CC92A9015A3ABD400C6D578 /* attached_no_data_signed_data.h in Headers */,
                                4CC92A9015A3ABD400C6D578 /* attached_no_data_signed_data.h in Headers */,
+                               D4A919781CA9A3DD003D2ADA /* si-95-cms-basic.h in Headers */,
                                4CC92A9115A3ABD400C6D578 /* attached_signed_data.h in Headers */,
                                4CC92A9115A3ABD400C6D578 /* attached_signed_data.h in Headers */,
-                               BECC54E61B98FF0000FB91DC /* si-86-sectrust-eap-tls.h in Headers */,
                                4CC92A9215A3ABD400C6D578 /* detached_content.h in Headers */,
                                4CC92A9315A3ABD400C6D578 /* detached_signed_data.h in Headers */,
                                4CC92A9415A3ABD400C6D578 /* privkey.h in Headers */,
                                4CC92A9515A3ABD400C6D578 /* signer.h in Headers */,
                                4CC92A9815A3ABD400C6D578 /* signed-receipt.h in Headers */,
                                4CC92A9215A3ABD400C6D578 /* detached_content.h in Headers */,
                                4CC92A9315A3ABD400C6D578 /* detached_signed_data.h in Headers */,
                                4CC92A9415A3ABD400C6D578 /* privkey.h in Headers */,
                                4CC92A9515A3ABD400C6D578 /* signer.h in Headers */,
                                4CC92A9815A3ABD400C6D578 /* signed-receipt.h in Headers */,
-                               4CC92A9A15A3ABD400C6D578 /* Global Trustee.cer.h in Headers */,
-                               4CC92A9B15A3ABD400C6D578 /* UTN-USERFirst-Hardware.cer.h in Headers */,
-                               4CC92A9C15A3ABD400C6D578 /* addons.mozilla.org.cer.h in Headers */,
-                               4CC92A9D15A3ABD400C6D578 /* login.live.com.cer.h in Headers */,
-                               D41380CA1C6E529500F1A4B6 /* si-92-sectrust-homekit.h in Headers */,
-                               4CC92A9E15A3ABD400C6D578 /* login.skype.com.cer.h in Headers */,
-                               4CC92A9F15A3ABD400C6D578 /* login.yahoo.com.1.cer.h in Headers */,
-                               4CC92AA015A3ABD400C6D578 /* login.yahoo.com.2.cer.h in Headers */,
-                               D40294AA1C20A806008CE4B6 /* si-91-sectrust-ast2.h in Headers */,
+                               D483DF6A1CD2DF9B00334824 /* si-20-sectrust.h in Headers */,
                                D4CBC1491BE9A89E00C5795E /* si-89-cms-hash-agility.h in Headers */,
                                D4CBC1491BE9A89E00C5795E /* si-89-cms-hash-agility.h in Headers */,
-                               4CC92AA115A3ABD400C6D578 /* login.yahoo.com.cer.h in Headers */,
-                               4CC92AA215A3ABD400C6D578 /* mail.google.com.cer.h in Headers */,
-                               858A54691BC6FE62008A03FA /* si-88-sectrust-vpnprofile.h in Headers */,
-                               4CC92AA315A3ABD400C6D578 /* www.google.com.cer.h in Headers */,
+                               D442160A1CCAD9C200D2D455 /* si-22-sectrust-iap.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -2246,6 +2205,7 @@
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               D4D886F11CECE75000DC7583 /* SecTrustInternal.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -2257,11 +2217,20 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
+               D40771B61C9B4D200016AA66 /* Headers */ = {
+                       isa = PBXHeadersBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                               0C0C887A1CCED00E00617D1B /* shared_regressions.h in Headers */,
+                               D44C81EA1CD1947200BE9A0D /* si-97-sectrust-path-scoring.h in Headers */,
+                               D4653DEB1C9E2299002ED6D5 /* si-28-sectrustsettings.h in Headers */,
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+               };
                E702E75014E1F3EA00CDE635 /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                E702E75014E1F3EA00CDE635 /* Headers */ = {
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               E75216AE1AF1F26500DDA573 /* SOSForerunnerSession.h in Headers */,
                                E777C72715B882E5004044A8 /* SOSPeerInfo.h in Headers */,
                                CDE5F87C1AF025AC0074958E /* SOSRingDER.h in Headers */,
                                4885010F1AF9857F00F10B61 /* SOSTypes.h in Headers */,
                                E777C72715B882E5004044A8 /* SOSPeerInfo.h in Headers */,
                                CDE5F87C1AF025AC0074958E /* SOSRingDER.h in Headers */,
                                4885010F1AF9857F00F10B61 /* SOSTypes.h in Headers */,
@@ -2293,6 +2262,7 @@
                                CDE5F8B71AF026470074958E /* SOSTransportKeyParameterKVS.h in Headers */,
                                CDE5F8B31AF026470074958E /* SOSTransportCircleKVS.h in Headers */,
                                CDE5F88A1AF025B30074958E /* SOSRingBackup.h in Headers */,
                                CDE5F8B71AF026470074958E /* SOSTransportKeyParameterKVS.h in Headers */,
                                CDE5F8B31AF026470074958E /* SOSTransportCircleKVS.h in Headers */,
                                CDE5F88A1AF025B30074958E /* SOSRingBackup.h in Headers */,
+                               481A95521D1A02AA000B98F5 /* SOSCloudKeychainLogging.h in Headers */,
                                48A071D01AD6AEA900728AEF /* SOSPeerInfoSecurityProperties.h in Headers */,
                                CDE5F89D1AF025BE0074958E /* SOSAccountPriv.h in Headers */,
                                489E6E4D1A71A87600D7EB8C /* SOSCircleDer.h in Headers */,
                                48A071D01AD6AEA900728AEF /* SOSPeerInfoSecurityProperties.h in Headers */,
                                CDE5F89D1AF025BE0074958E /* SOSAccountPriv.h in Headers */,
                                489E6E4D1A71A87600D7EB8C /* SOSCircleDer.h in Headers */,
@@ -2309,11 +2279,13 @@
                                CDE5F8A11AF025BE0074958E /* SOSBackupSliceKeyBag.h in Headers */,
                                CDE5F8821AF025AC0074958E /* SOSRingUtils.h in Headers */,
                                CDE5F89B1AF025BE0074958E /* SOSAccount.h in Headers */,
                                CDE5F8A11AF025BE0074958E /* SOSBackupSliceKeyBag.h in Headers */,
                                CDE5F8821AF025AC0074958E /* SOSRingUtils.h in Headers */,
                                CDE5F89B1AF025BE0074958E /* SOSAccount.h in Headers */,
+                               48122CCA1CFF88FF009BE3E3 /* SOSAccountLog.h in Headers */,
                                CDE5F8911AF025B80074958E /* SOSCircleRings.h in Headers */,
                                CDE5F8871AF025B30074958E /* SOSGenCount.h in Headers */,
                                48FB17031A76F56C00B586C7 /* SOSPeerInfoV2.h in Headers */,
                                5284629C1AE6FCF0004C1BA2 /* SOSBackupEvent.h in Headers */,
                                4CBDB30E17B70206002FA799 /* SOSMessage.h in Headers */,
                                CDE5F8911AF025B80074958E /* SOSCircleRings.h in Headers */,
                                CDE5F8871AF025B30074958E /* SOSGenCount.h in Headers */,
                                48FB17031A76F56C00B586C7 /* SOSPeerInfoV2.h in Headers */,
                                5284629C1AE6FCF0004C1BA2 /* SOSBackupEvent.h in Headers */,
                                4CBDB30E17B70206002FA799 /* SOSMessage.h in Headers */,
+                               48FD04F41CEFCFB900BEBBFF /* SOSAccountTransaction.h in Headers */,
                                E79277E4163B110A0096F3E2 /* SOSFullPeerInfo.h in Headers */,
                                E7B01B5B16532507000485F1 /* SOSCloudCircleInternal.h in Headers */,
                                CDE5F8A71AF025DC0074958E /* SOSARCDefines.h in Headers */,
                                E79277E4163B110A0096F3E2 /* SOSFullPeerInfo.h in Headers */,
                                E7B01B5B16532507000485F1 /* SOSCloudCircleInternal.h in Headers */,
                                CDE5F8A71AF025DC0074958E /* SOSARCDefines.h in Headers */,
@@ -2326,7 +2298,6 @@
                        buildActionMask = 2147483647;
                        files = (
                                4C495EDE1982125E00BC1809 /* SOSTestDevice.h in Headers */,
                        buildActionMask = 2147483647;
                        files = (
                                4C495EDE1982125E00BC1809 /* SOSTestDevice.h in Headers */,
-                               521C0CDD15FFA05100604B61 /* CKDKeyValueStore.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -2476,23 +2447,6 @@
                        productReference = 4CC92B1415A3BC6B00C6D578 /* libsecuritydRegressions.a */;
                        productType = "com.apple.product-type.library.static";
                };
                        productReference = 4CC92B1415A3BC6B00C6D578 /* libsecuritydRegressions.a */;
                        productType = "com.apple.product-type.library.static";
                };
-               5284029F164445760035F320 /* libCloudKeychainProxy */ = {
-                       isa = PBXNativeTarget;
-                       buildConfigurationList = 528402A9164445760035F320 /* Build configuration list for PBXNativeTarget "libCloudKeychainProxy" */;
-                       buildPhases = (
-                               5284029C164445760035F320 /* Sources */,
-                               5284029D164445760035F320 /* Frameworks */,
-                               5284029E164445760035F320 /* CopyFiles */,
-                       );
-                       buildRules = (
-                       );
-                       dependencies = (
-                       );
-                       name = libCloudKeychainProxy;
-                       productName = libCloudKeychainProxy;
-                       productReference = 528402A0164445760035F320 /* libCloudKeychainProxy.a */;
-                       productType = "com.apple.product-type.library.static";
-               };
                BE8D227F1ABB7199009A4E18 /* libSecTrustOSX */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = BE8D228B1ABB7199009A4E18 /* Build configuration list for PBXNativeTarget "libSecTrustOSX" */;
                BE8D227F1ABB7199009A4E18 /* libSecTrustOSX */ = {
                        isa = PBXNativeTarget;
                        buildConfigurationList = BE8D228B1ABB7199009A4E18 /* Build configuration list for PBXNativeTarget "libSecTrustOSX" */;
@@ -2527,21 +2481,21 @@
                        productReference = BEF9640618B4171200813FA3 /* libSWCAgent.a */;
                        productType = "com.apple.product-type.library.static";
                };
                        productReference = BEF9640618B4171200813FA3 /* libSWCAgent.a */;
                        productType = "com.apple.product-type.library.static";
                };
-               CD3F914A1A802EBF00E07119 /* libIDSKeychainSyncingProxy */ = {
+               D40771B71C9B4D200016AA66 /* libSharedRegressions */ = {
                        isa = PBXNativeTarget;
                        isa = PBXNativeTarget;
-                       buildConfigurationList = CD3F915C1A802EC000E07119 /* Build configuration list for PBXNativeTarget "libIDSKeychainSyncingProxy" */;
+                       buildConfigurationList = D40771B91C9B4D200016AA66 /* Build configuration list for PBXNativeTarget "libSharedRegressions" */;
                        buildPhases = (
                        buildPhases = (
-                               CD3F91471A802EBF00E07119 /* Sources */,
-                               CD3F91481A802EBF00E07119 /* Frameworks */,
-                               CD3F91491A802EBF00E07119 /* CopyFiles */,
+                               D40771B41C9B4D200016AA66 /* Sources */,
+                               D40771B51C9B4D200016AA66 /* Frameworks */,
+                               D40771B61C9B4D200016AA66 /* Headers */,
                        );
                        buildRules = (
                        );
                        dependencies = (
                        );
                        );
                        buildRules = (
                        );
                        dependencies = (
                        );
-                       name = libIDSKeychainSyncingProxy;
-                       productName = libIDSKeychainSyncingProxy;
-                       productReference = CD3F914B1A802EBF00E07119 /* libIDSKeychainSyncingProxy.a */;
+                       name = libSharedRegressions;
+                       productName = libSharedRegressions;
+                       productReference = D40771B81C9B4D200016AA66 /* libSharedRegressions.a */;
                        productType = "com.apple.product-type.library.static";
                };
                E702E73514E1F3EA00CDE635 /* libSecureObjectSync */ = {
                        productType = "com.apple.product-type.library.static";
                };
                E702E73514E1F3EA00CDE635 /* libSecureObjectSync */ = {
@@ -2652,10 +2606,10 @@
                186CDD0614CA116C00AF9171 /* Project object */ = {
                        isa = PBXProject;
                        attributes = {
                186CDD0614CA116C00AF9171 /* Project object */ = {
                        isa = PBXProject;
                        attributes = {
-                               LastUpgradeCheck = 0700;
+                               LastUpgradeCheck = 0800;
                                TargetAttributes = {
                                TargetAttributes = {
-                                       CD3F914A1A802EBF00E07119 = {
-                                               CreatedOnToolsVersion = 7.0;
+                                       D40771B71C9B4D200016AA66 = {
+                                               CreatedOnToolsVersion = 7.3;
                                        };
                                };
                        };
                                        };
                                };
                        };
@@ -2677,18 +2631,17 @@
                                BE8D227F1ABB7199009A4E18 /* libSecTrustOSX */,
                                18270F5414CF651900B05E7F /* libsecipc_client */,
                                E702E73514E1F3EA00CDE635 /* libSecureObjectSync */,
                                BE8D227F1ABB7199009A4E18 /* libSecTrustOSX */,
                                18270F5414CF651900B05E7F /* libsecipc_client */,
                                E702E73514E1F3EA00CDE635 /* libSecureObjectSync */,
-                               E702E75714E1F48800CDE635 /* libSOSRegressions */,
-                               4A824AFB158FF07000F932C0 /* libSecurityRegressions */,
-                               4CC92AC215A3BC6B00C6D578 /* libsecuritydRegressions */,
                                4A5CCA4E15ACEFA500702357 /* libSecOtrOSX */,
                                4A5CCA4E15ACEFA500702357 /* libSecOtrOSX */,
-                               5284029F164445760035F320 /* libCloudKeychainProxy */,
-                               CD3F914A1A802EBF00E07119 /* libIDSKeychainSyncingProxy */,
                                E71049F1169E023B00DB0045 /* libSecurityTool */,
                                E7104A12169E216E00DB0045 /* libSecurityCommands */,
                                E7FEFB82169E363300E18152 /* libSOSCommands */,
                                E71049F1169E023B00DB0045 /* libSecurityTool */,
                                E7104A12169E216E00DB0045 /* libSecurityCommands */,
                                E7FEFB82169E363300E18152 /* libSOSCommands */,
-                               0C0BDB55175687EC00BC1A7E /* libsecdRegressions */,
                                BEF963FE18B4171200813FA3 /* libSWCAgent */,
                                E76079971951FD2800F69731 /* liblogging */,
                                BEF963FE18B4171200813FA3 /* libSWCAgent */,
                                E76079971951FD2800F69731 /* liblogging */,
+                               E702E75714E1F48800CDE635 /* libSOSRegressions */,
+                               4A824AFB158FF07000F932C0 /* libSecurityRegressions */,
+                               4CC92AC215A3BC6B00C6D578 /* libsecuritydRegressions */,
+                               0C0BDB55175687EC00BC1A7E /* libsecdRegressions */,
+                               D40771B71C9B4D200016AA66 /* libSharedRegressions */,
                        );
                };
 /* End PBXProject section */
                        );
                };
 /* End PBXProject section */
@@ -2698,17 +2651,22 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               4826374D1CC18A410082C9C8 /* secd-57-1-account-last-standing.c in Sources */,
                                CD655E951AF02DDC00BD1B6E /* secd-62-account-backup.c in Sources */,
                                523CBBF61B321C6A002C0884 /* secd-50-message.c in Sources */,
                                E7F0D3EA177BBE35001ACBC1 /* secd-55-account-incompatibility.c in Sources */,
                                0C0BDB63175688DA00BC1A7E /* secd-01-items.c in Sources */,
                                4882C517177521AE0095D04B /* secd-58-password-change.c in Sources */,
                                CD655E951AF02DDC00BD1B6E /* secd-62-account-backup.c in Sources */,
                                523CBBF61B321C6A002C0884 /* secd-50-message.c in Sources */,
                                E7F0D3EA177BBE35001ACBC1 /* secd-55-account-incompatibility.c in Sources */,
                                0C0BDB63175688DA00BC1A7E /* secd-01-items.c in Sources */,
                                4882C517177521AE0095D04B /* secd-58-password-change.c in Sources */,
+                               48B5888C1D00ED9000E0C5A7 /* secd-200-logstate.c in Sources */,
                                EB3409AF1C1D5BBE00D77661 /* secd-20-keychain_upgrade.m in Sources */,
                                E7A10FAE1771249C00C4602F /* secd-57-account-leave.c in Sources */,
                                48FABEE31AD06B6B00C061D1 /* secd-62-account-hsa-join.c in Sources */,
                                EB3409AF1C1D5BBE00D77661 /* secd-20-keychain_upgrade.m in Sources */,
                                E7A10FAE1771249C00C4602F /* secd-57-account-leave.c in Sources */,
                                48FABEE31AD06B6B00C061D1 /* secd-62-account-hsa-join.c in Sources */,
+                               CD9B54131CC6EED100CC487A /* secd-100-initialsync.c in Sources */,
                                4469FC2C1AA0A6C90021AA26 /* secd-32-restore-bad-backup.c in Sources */,
                                523CBBF91B3227B5002C0884 /* secd-49-manifests.c in Sources */,
                                E7F18555177A44E000177B23 /* secd-60-account-cloud-identity.c in Sources */,
                                4469FC2C1AA0A6C90021AA26 /* secd-32-restore-bad-backup.c in Sources */,
                                523CBBF91B3227B5002C0884 /* secd-49-manifests.c in Sources */,
                                E7F18555177A44E000177B23 /* secd-60-account-cloud-identity.c in Sources */,
+                               5EF2596F1CB5214B009B4C58 /* secd-83-item-match-policy.m in Sources */,
+                               5E0CE1651CB6347300E75776 /* secd-83-item-match-valid-on-date.m in Sources */,
                                4CC62F221B4EF136009FEF0E /* secd-75-engine-views.c in Sources */,
                                F9EF72F21AC0F98400A4D24A /* secd-70-engine-smash.c in Sources */,
                                5384299418E492A300E91AFE /* secd-70-otr-remote.c in Sources */,
                                4CC62F221B4EF136009FEF0E /* secd-75-engine-views.c in Sources */,
                                F9EF72F21AC0F98400A4D24A /* secd-70-engine-smash.c in Sources */,
                                5384299418E492A300E91AFE /* secd-70-otr-remote.c in Sources */,
@@ -2720,9 +2678,11 @@
                                0CBF93F8177B7CFC001E5658 /* secd-03-corrupted-items.c in Sources */,
                                E75AB91B1AE9964800C5EF3F /* secd-40-cc-gestalt.c in Sources */,
                                0CBF93FC177BA9D9001E5658 /* secd-05-corrupted-items.m in Sources */,
                                0CBF93F8177B7CFC001E5658 /* secd-03-corrupted-items.c in Sources */,
                                E75AB91B1AE9964800C5EF3F /* secd-40-cc-gestalt.c in Sources */,
                                0CBF93FC177BA9D9001E5658 /* secd-05-corrupted-items.m in Sources */,
+                               5E0CE1671CB6348D00E75776 /* secd-83-item-match-trusted.m in Sources */,
                                527258D11981C00F003CFCEC /* secd-70-engine.c in Sources */,
                                E7850ED11BB30E87002A54CA /* secd-65-account-retirement-reset.c in Sources */,
                                4C495EDF1982145200BC1809 /* SOSTestDevice.c in Sources */,
                                527258D11981C00F003CFCEC /* secd-70-engine.c in Sources */,
                                E7850ED11BB30E87002A54CA /* secd-65-account-retirement-reset.c in Sources */,
                                4C495EDF1982145200BC1809 /* SOSTestDevice.c in Sources */,
+                               E78A9AB21D34263100006B5B /* secd-130-other-peer-views.c in Sources */,
                                0CBF93F9177B7CFC001E5658 /* secd-04-corrupted-items.c in Sources */,
                                4898223A17BDB277003BEF32 /* secd-52-account-changed.c in Sources */,
                                0C062B1F175E784B00806CFE /* secd-30-keychain-upgrade.c in Sources */,
                                0CBF93F9177B7CFC001E5658 /* secd-04-corrupted-items.c in Sources */,
                                4898223A17BDB277003BEF32 /* secd-52-account-changed.c in Sources */,
                                0C062B1F175E784B00806CFE /* secd-30-keychain-upgrade.c in Sources */,
@@ -2738,12 +2698,13 @@
                                5EA016381AD41AC70061BCD7 /* secd-81-item-acl.c in Sources */,
                                4C495EE21982171500BC1809 /* secd-70-engine-corrupt.c in Sources */,
                                CDAD4E9D18EC9B67007D4BC2 /* SOSTransportTestTransports.c in Sources */,
                                5EA016381AD41AC70061BCD7 /* secd-81-item-acl.c in Sources */,
                                4C495EE21982171500BC1809 /* secd-70-engine-corrupt.c in Sources */,
                                CDAD4E9D18EC9B67007D4BC2 /* SOSTransportTestTransports.c in Sources */,
+                               48A9E62F1C837B4100160B5F /* secd-90-hsa2.c in Sources */,
                                529F46F31AEC7A2E0002392C /* secd-34-backup-der-parse.c in Sources */,
                                486C6C691795F9D600387075 /* secd-61-account-leave-not-in-kansas-anymore.c in Sources */,
                                E79D62BD176799EE005A9743 /* SOSTestDataSource.c in Sources */,
                                EBF2D7661C1E482B006AB6FF /* secd-21-transmogrify.m in Sources */,
                                448305111B46FC0D00326450 /* secd-35-keychain-migrate-inet.c in Sources */,
                                529F46F31AEC7A2E0002392C /* secd-34-backup-der-parse.c in Sources */,
                                486C6C691795F9D600387075 /* secd-61-account-leave-not-in-kansas-anymore.c in Sources */,
                                E79D62BD176799EE005A9743 /* SOSTestDataSource.c in Sources */,
                                EBF2D7661C1E482B006AB6FF /* secd-21-transmogrify.m in Sources */,
                                448305111B46FC0D00326450 /* secd-35-keychain-migrate-inet.c in Sources */,
-                               4469FC2D1AA0A6D00021AA26 /* secd-33-keychain-ctk.c in Sources */,
+                               4469FC2D1AA0A6D00021AA26 /* secd-33-keychain-ctk.m in Sources */,
                                E79D62BC176799DB005A9743 /* SOSRegressionUtilities.c in Sources */,
                                E7A10FAC1771246A00C4602F /* secd-55-account-circle.c in Sources */,
                                E79D62C01767A5BC005A9743 /* SecdTestKeychainUtilities.c in Sources */,
                                E79D62BC176799DB005A9743 /* SOSRegressionUtilities.c in Sources */,
                                E7A10FAC1771246A00C4602F /* secd-55-account-circle.c in Sources */,
                                E79D62C01767A5BC005A9743 /* SecdTestKeychainUtilities.c in Sources */,
@@ -2765,12 +2726,17 @@
                        buildActionMask = 2147483647;
                        files = (
                                52FD82A01AEAC8C100634FD3 /* SecItemBackup.c in Sources */,
                        buildActionMask = 2147483647;
                        files = (
                                52FD82A01AEAC8C100634FD3 /* SecItemBackup.c in Sources */,
+                               093F67A51CC1171B0033151D /* SecKeyAdaptors.c in Sources */,
+                               D47F511E1C3B660500A7CEFE /* SecCFAllocator.c in Sources */,
                                18AD566714CB70A8008233F2 /* SecItem.c in Sources */,
                                18AD566714CB70A8008233F2 /* SecItem.c in Sources */,
+                               442B69221BC3B1B9000F3A72 /* SecRSAKey.c in Sources */,
                                BEFE994E14F2E17200356A97 /* SecDH.c in Sources */,
                                BEFE994E14F2E17200356A97 /* SecDH.c in Sources */,
+                               442B69251BC3DBA9000F3A72 /* SecCTKKey.c in Sources */,
                                4C8D8627177A71E80019A804 /* SOSCloudCircle.c in Sources */,
                                446BB5E518F83172005D1B83 /* SecAccessControl.c in Sources */,
                                4C8D8627177A71E80019A804 /* SOSCloudCircle.c in Sources */,
                                446BB5E518F83172005D1B83 /* SecAccessControl.c in Sources */,
+                               442B69201BC3B149000F3A72 /* SecKey.c in Sources */,
                                4C3CE9E7176005A700B521C2 /* SecuritydXPC.c in Sources */,
                                4C3CE9E7176005A700B521C2 /* SecuritydXPC.c in Sources */,
-                               4C8940DB166EA8CF00241770 /* osxshim.c in Sources */,
+                               442B69211BC3B196000F3A72 /* SecECKey.c in Sources */,
                                52BF439C1AFC50EC00821B5D /* SecItemConstants.c in Sources */,
                                4C8D8628177A71FB0019A804 /* SecPasswordGenerate.c in Sources */,
                        );
                                52BF439C1AFC50EC00821B5D /* SecItemConstants.c in Sources */,
                                4C8D8628177A71FB0019A804 /* SecPasswordGenerate.c in Sources */,
                        );
@@ -2781,20 +2747,27 @@
                        buildActionMask = 2147483647;
                        files = (
                                18D4043914CE1FE400A2BE4E /* p12import.c in Sources */,
                        buildActionMask = 2147483647;
                        files = (
                                18D4043914CE1FE400A2BE4E /* p12import.c in Sources */,
+                               0C3276C31CB329AB005D6DDC /* secd_77_ids_messaging.c in Sources */,
                                18D4043A14CE1FE400A2BE4E /* p12pbegen.c in Sources */,
                                18D4043B14CE1FE400A2BE4E /* pbkdf2.c in Sources */,
                                18D4043A14CE1FE400A2BE4E /* p12pbegen.c in Sources */,
                                18D4043B14CE1FE400A2BE4E /* pbkdf2.c in Sources */,
+                               D47F511D1C3B660500A7CEFE /* SecCFAllocator.c in Sources */,
                                C6766768189884D200E9A12C /* SecAccessControl.c in Sources */,
                                18D4043C14CE1FE400A2BE4E /* SecBase64.c in Sources */,
                                CDF9BBE11B03E24D00D1AF0F /* secd-52-offering-gencount-reset.c in Sources */,
                                18D4043D14CE1FE400A2BE4E /* SecCertificate.c in Sources */,
                                18D4043E14CE1FE400A2BE4E /* SecCertificatePath.c in Sources */,
                                18D4043F14CE1FE400A2BE4E /* SecCertificateRequest.c in Sources */,
                                C6766768189884D200E9A12C /* SecAccessControl.c in Sources */,
                                18D4043C14CE1FE400A2BE4E /* SecBase64.c in Sources */,
                                CDF9BBE11B03E24D00D1AF0F /* secd-52-offering-gencount-reset.c in Sources */,
                                18D4043D14CE1FE400A2BE4E /* SecCertificate.c in Sources */,
                                18D4043E14CE1FE400A2BE4E /* SecCertificatePath.c in Sources */,
                                18D4043F14CE1FE400A2BE4E /* SecCertificateRequest.c in Sources */,
+                               0C60F39C1CAF0E8E00221D24 /* secd-76-idstransport.c in Sources */,
                                18D4044014CE1FE400A2BE4E /* SecCMS.c in Sources */,
                                18D4044014CE1FE400A2BE4E /* SecCMS.c in Sources */,
+                               4899F2E91C768BBE00762615 /* secToolFileIO.c in Sources */,
                                18D4044114CE1FE400A2BE4E /* SecDH.c in Sources */,
                                18D4044114CE1FE400A2BE4E /* SecDH.c in Sources */,
+                               5221C4981CBEDB7C006047E7 /* secd-71-engine-save.c in Sources */,
                                449265291AB0D6FF00644D4C /* SecCTKKey.c in Sources */,
                                CD8F442D1B83C435004C0047 /* secd-95-escrow-persistence.c in Sources */,
                                18D4044214CE1FE400A2BE4E /* SecECKey.c in Sources */,
                                CD35B82A1C2650FE00E0852A /* secd-154-engine-backoff.c in Sources */,
                                449265291AB0D6FF00644D4C /* SecCTKKey.c in Sources */,
                                CD8F442D1B83C435004C0047 /* secd-95-escrow-persistence.c in Sources */,
                                18D4044214CE1FE400A2BE4E /* SecECKey.c in Sources */,
                                CD35B82A1C2650FE00E0852A /* secd-154-engine-backoff.c in Sources */,
+                               093F67A41CC1171B0033151D /* SecKeyAdaptors.c in Sources */,
+                               D48C567D1C73E5C300E41928 /* SecPolicyLeafCallbacks.c in Sources */,
                                18D4044314CE1FE400A2BE4E /* SecFramework.c in Sources */,
                                18D4044414CE1FE400A2BE4E /* SecIdentity.c in Sources */,
                                18D4044514CE1FE400A2BE4E /* SecImportExport.c in Sources */,
                                18D4044314CE1FE400A2BE4E /* SecFramework.c in Sources */,
                                18D4044414CE1FE400A2BE4E /* SecIdentity.c in Sources */,
                                18D4044514CE1FE400A2BE4E /* SecImportExport.c in Sources */,
@@ -2817,7 +2790,10 @@
                                18D4045014CE1FE400A2BE4E /* vmdh.c in Sources */,
                                4A971696158FDEB800D439B7 /* SecOTRDHKey.c in Sources */,
                                E795C9541913F88D00FA068C /* SecServerEncryptionSupport.c in Sources */,
                                18D4045014CE1FE400A2BE4E /* vmdh.c in Sources */,
                                4A971696158FDEB800D439B7 /* SecOTRDHKey.c in Sources */,
                                E795C9541913F88D00FA068C /* SecServerEncryptionSupport.c in Sources */,
+                               BE4AC7DE1C938698002A28FE /* SecSignatureVerificationSupport.c in Sources */,
+                               4838F6BF1CB5AA7E009E8598 /* secViewDisplay.c in Sources */,
                                4A971699158FDEB800D439B7 /* SecOTRFullIdentity.c in Sources */,
                                4A971699158FDEB800D439B7 /* SecOTRFullIdentity.c in Sources */,
+                               EB6432BD1C510A6E00B671F2 /* SecDigest.c in Sources */,
                                4A97169B158FDEB800D439B7 /* SecOTRMath.c in Sources */,
                                4A97169E158FDEB800D439B7 /* SecOTRPacketData.c in Sources */,
                                4A9716A0158FDEB800D439B7 /* SecOTRPackets.c in Sources */,
                                4A97169B158FDEB800D439B7 /* SecOTRMath.c in Sources */,
                                4A97169E158FDEB800D439B7 /* SecOTRPacketData.c in Sources */,
                                4A9716A0158FDEB800D439B7 /* SecOTRPackets.c in Sources */,
@@ -2835,6 +2811,7 @@
                        files = (
                                E795C9481911A41300FA068C /* SecLogSettingsServer.c in Sources */,
                                4C055FF717B60F1E001A879A /* SecItemSchema.c in Sources */,
                        files = (
                                E795C9481911A41300FA068C /* SecLogSettingsServer.c in Sources */,
                                4C055FF717B60F1E001A879A /* SecItemSchema.c in Sources */,
+                               E738B72F1D11D9760099E5C5 /* SOSChangeTracker.c in Sources */,
                                4C055FF617B60F1E001A879A /* SecItemDb.c in Sources */,
                                7249E1CB16C01E5F003D7268 /* OTATrustUtilities.c in Sources */,
                                5356520318E3C71000C383C0 /* SecOTRRemote.c in Sources */,
                                4C055FF617B60F1E001A879A /* SecItemDb.c in Sources */,
                                7249E1CB16C01E5F003D7268 /* OTATrustUtilities.c in Sources */,
                                5356520318E3C71000C383C0 /* SecOTRRemote.c in Sources */,
@@ -2846,11 +2823,11 @@
                                4C3CE9E8176005B500B521C2 /* SecuritydXPC.c in Sources */,
                                18D4056C14CE53DD00A2BE4E /* SecOCSPCache.c in Sources */,
                                72B5923D17C6939A00AE738B /* iCloudTrace.c in Sources */,
                                4C3CE9E8176005B500B521C2 /* SecuritydXPC.c in Sources */,
                                18D4056C14CE53DD00A2BE4E /* SecOCSPCache.c in Sources */,
                                72B5923D17C6939A00AE738B /* iCloudTrace.c in Sources */,
-                               E7285C971AE1E47D00AD412D /* SOSEngine.c in Sources */,
                                4C055FF317B60F1E001A879A /* SecDbKeychainItem.c in Sources */,
                                18D4056D14CE53DD00A2BE4E /* SecOCSPRequest.c in Sources */,
                                18D4056E14CE53DD00A2BE4E /* SecOCSPResponse.c in Sources */,
                                18D4056F14CE53DD00A2BE4E /* SecPolicyServer.c in Sources */,
                                4C055FF317B60F1E001A879A /* SecDbKeychainItem.c in Sources */,
                                18D4056D14CE53DD00A2BE4E /* SecOCSPRequest.c in Sources */,
                                18D4056E14CE53DD00A2BE4E /* SecOCSPResponse.c in Sources */,
                                18D4056F14CE53DD00A2BE4E /* SecPolicyServer.c in Sources */,
+                               E738B7301D11D9840099E5C5 /* SOSEngine.c in Sources */,
                                4C055FF817B60F1E001A879A /* SecKeybagSupport.c in Sources */,
                                4C055FF517B60F1E001A879A /* SecItemDataSource.c in Sources */,
                                4C055FF417B60F1E001A879A /* SecDbQuery.c in Sources */,
                                4C055FF817B60F1E001A879A /* SecKeybagSupport.c in Sources */,
                                4C055FF517B60F1E001A879A /* SecItemDataSource.c in Sources */,
                                4C055FF417B60F1E001A879A /* SecDbQuery.c in Sources */,
@@ -2861,8 +2838,8 @@
                                18D4057214CE547400A2BE4E /* spi.c in Sources */,
                                E7B01B691655DF20000485F1 /* SOSCloudCircleServer.c in Sources */,
                                BE5EC1F018C80108005E7682 /* swcagent_client.c in Sources */,
                                18D4057214CE547400A2BE4E /* spi.c in Sources */,
                                E7B01B691655DF20000485F1 /* SOSCloudCircleServer.c in Sources */,
                                BE5EC1F018C80108005E7682 /* swcagent_client.c in Sources */,
-                               E7285CAC1AE1E4DF00AD412D /* SOSChangeTracker.c in Sources */,
                                525394AE1660A30000BA9687 /* SecDbItem.c in Sources */,
                                525394AE1660A30000BA9687 /* SecDbItem.c in Sources */,
+                               D474EF341C8A1CBC00AA4D86 /* personalization.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -2886,17 +2863,14 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               D4B4A9A81B8BB9B70097B393 /* si-85-sectrust-ssl-policy.c in Sources */,
-                               D445CDE11B44D53C005040AC /* si-84-sectrust-atv-appsigning.c in Sources */,
-                               BE794826196DBEAD00F4BA63 /* si-81-sectrust-server-auth.c in Sources */,
                                D4CBC1481BE9A89E00C5795E /* si-89-cms-hash-agility.c in Sources */,
                                4CC92A5F15A3ABD400C6D578 /* pbkdf2-00-hmac-sha1.c in Sources */,
                                4CC92A6015A3ABD400C6D578 /* spbkdf-00-hmac-sha1.c in Sources */,
                                4CC92A6115A3ABD400C6D578 /* otr-00-identity.c in Sources */,
                                4CC92A6215A3ABD400C6D578 /* otr-30-negotiation.c in Sources */,
                                4CC92A6315A3ABD400C6D578 /* otr-otrdh.c in Sources */,
                                D4CBC1481BE9A89E00C5795E /* si-89-cms-hash-agility.c in Sources */,
                                4CC92A5F15A3ABD400C6D578 /* pbkdf2-00-hmac-sha1.c in Sources */,
                                4CC92A6015A3ABD400C6D578 /* spbkdf-00-hmac-sha1.c in Sources */,
                                4CC92A6115A3ABD400C6D578 /* otr-00-identity.c in Sources */,
                                4CC92A6215A3ABD400C6D578 /* otr-30-negotiation.c in Sources */,
                                4CC92A6315A3ABD400C6D578 /* otr-otrdh.c in Sources */,
+                               EBD344801D234E37008B6DEA /* si-15-delete-access-group.m in Sources */,
                                4CC92A6415A3ABD400C6D578 /* otr-packetdata.c in Sources */,
                                4CC92A6415A3ABD400C6D578 /* otr-packetdata.c in Sources */,
-                               7DE20930192D29D90066419C /* si-79-smp-cert-policy.c in Sources */,
                                4CC92A6515A3ABD400C6D578 /* si-00-find-nothing.c in Sources */,
                                4CC92A6615A3ABD400C6D578 /* si-05-add.c in Sources */,
                                4CC92A6715A3ABD400C6D578 /* si-10-find-internet.c in Sources */,
                                4CC92A6515A3ABD400C6D578 /* si-00-find-nothing.c in Sources */,
                                4CC92A6615A3ABD400C6D578 /* si-05-add.c in Sources */,
                                4CC92A6715A3ABD400C6D578 /* si-10-find-internet.c in Sources */,
@@ -2904,47 +2878,22 @@
                                CD8E09011A2E918900A2503A /* otr-40-edgecases.c in Sources */,
                                4CC92A6815A3ABD400C6D578 /* si-11-update-data.c in Sources */,
                                4CC92A6915A3ABD400C6D578 /* si-14-dateparse.c in Sources */,
                                CD8E09011A2E918900A2503A /* otr-40-edgecases.c in Sources */,
                                4CC92A6815A3ABD400C6D578 /* si-11-update-data.c in Sources */,
                                4CC92A6915A3ABD400C6D578 /* si-14-dateparse.c in Sources */,
-                               4CC92A6A15A3ABD400C6D578 /* si-15-certificate.c in Sources */,
+                               D4A919771CA9A3DD003D2ADA /* si-95-cms-basic.c in Sources */,
                                4406660F19069C67000DA171 /* si-80-empty-data.c in Sources */,
                                BE061FCF1899E5BD00C739F6 /* si-76-shared-credentials.c in Sources */,
                                4406660F19069C67000DA171 /* si-80-empty-data.c in Sources */,
                                BE061FCF1899E5BD00C739F6 /* si-76-shared-credentials.c in Sources */,
-                               4CC92A6B15A3ABD400C6D578 /* si-16-ec-certificate.c in Sources */,
-                               4CC92A6C15A3ABD400C6D578 /* si-20-sectrust-activation.c in Sources */,
-                               4CC92A6D15A3ABD400C6D578 /* si-20-sectrust.c in Sources */,
                                BE62D7601747FF3E001EAA9D /* si-72-syncableitems.c in Sources */,
                                BE62D7601747FF3E001EAA9D /* si-72-syncableitems.c in Sources */,
-                               858A54681BC6FE62008A03FA /* si-88-sectrust-vpnprofile.c in Sources */,
-                               4CC92A6E15A3ABD400C6D578 /* si-21-sectrust-asr.c in Sources */,
-                               4CC92A6F15A3ABD400C6D578 /* si-22-sectrust-iap.c in Sources */,
-                               4CC92A7015A3ABD400C6D578 /* si-23-sectrust-ocsp.c in Sources */,
-                               4CC92A7115A3ABD400C6D578 /* si-24-sectrust-appleid.c in Sources */,
-                               4CC92A7215A3ABD400C6D578 /* si-24-sectrust-digicert-malaysia.c in Sources */,
-                               4CC92A7315A3ABD400C6D578 /* si-24-sectrust-diginotar.c in Sources */,
                                EB9C1D0A1BDDBDE000F89272 /* si-13-item-system.m in Sources */,
                                EB9C1D0A1BDDBDE000F89272 /* si-13-item-system.m in Sources */,
-                               D4DFC94A1B9958D00040945C /* si-87-sectrust-name-constraints.c in Sources */,
                                CDB6A8B81A409BC600646CD6 /* otr-60-slowroll.c in Sources */,
                                CDB6A8B81A409BC600646CD6 /* otr-60-slowroll.c in Sources */,
-                               4CC92A7415A3ABD400C6D578 /* si-24-sectrust-itms.c in Sources */,
                                EB69AB061BF425FD00913AF1 /* si-90-emcs.m in Sources */,
                                EB69AB061BF425FD00913AF1 /* si-90-emcs.m in Sources */,
-                               4CC92A7515A3ABD400C6D578 /* si-24-sectrust-mobileasset.c in Sources */,
                                4477A8D918F28AB700B5BB9F /* si-78-query-attrs.c in Sources */,
                                4477A8D918F28AB700B5BB9F /* si-78-query-attrs.c in Sources */,
-                               4CC92A7615A3ABD400C6D578 /* si-24-sectrust-nist.c in Sources */,
-                               D41380C91C6E529500F1A4B6 /* si-92-sectrust-homekit.c in Sources */,
-                               4CC92A7715A3ABD400C6D578 /* si-24-sectrust-otatasking.c in Sources */,
-                               4CC92A7815A3ABD400C6D578 /* si-24-sectrust-shoebox.c in Sources */,
-                               EB8F48DD1AE4CC7000CE93A7 /* si-25-sectrust-apple-authentication.c in Sources */,
-                               4CC92A7915A3ABD400C6D578 /* si-25-sectrust-ipsec-eap.c in Sources */,
-                               4CC92A7A15A3ABD400C6D578 /* si-26-applicationsigning.c in Sources */,
-                               4CC92A7B15A3ABD400C6D578 /* si-27-sectrust-exceptions.c in Sources */,
-                               4CC92A7C15A3ABD400C6D578 /* si-28-sectrustsettings.c in Sources */,
-                               4CC92A7D15A3ABD400C6D578 /* si-29-sectrust-codesigning.c in Sources */,
+                               440BF8F81A7A82AE001760A7 /* si-82-token-ag.c in Sources */,
                                4CC92A7E15A3ABD400C6D578 /* si-30-keychain-upgrade.c in Sources */,
                                4C2C8C3D17AB374700C24C13 /* si-12-item-stress.c in Sources */,
                                4CC92A7E15A3ABD400C6D578 /* si-30-keychain-upgrade.c in Sources */,
                                4C2C8C3D17AB374700C24C13 /* si-12-item-stress.c in Sources */,
-                               D40294A91C20A806008CE4B6 /* si-91-sectrust-ast2.c in Sources */,
                                4CC92A7F15A3ABD400C6D578 /* si-31-keychain-bad.c in Sources */,
                                4CC92A8015A3ABD400C6D578 /* si-31-keychain-unreadable.c in Sources */,
                                4CC92A8215A3ABD400C6D578 /* si-33-keychain-backup.c in Sources */,
                                4CC92A7F15A3ABD400C6D578 /* si-31-keychain-bad.c in Sources */,
                                4CC92A8015A3ABD400C6D578 /* si-31-keychain-unreadable.c in Sources */,
                                4CC92A8215A3ABD400C6D578 /* si-33-keychain-backup.c in Sources */,
-                               BE0CC6081A96B69000662E69 /* si-83-seccertificate-sighashalg.c in Sources */,
                                4CC92A8315A3ABD400C6D578 /* si-40-seckey-custom.c in Sources */,
                                E7CA197A17179EC20065299C /* si-69-keydesc.c in Sources */,
                                4CC92A8315A3ABD400C6D578 /* si-40-seckey-custom.c in Sources */,
                                E7CA197A17179EC20065299C /* si-69-keydesc.c in Sources */,
-                               BE62D7621747FF51001EAA9D /* si-70-sectrust-unified.c in Sources */,
                                4CC92A8415A3ABD400C6D578 /* si-40-seckey.c in Sources */,
                                4CC92A8515A3ABD400C6D578 /* si-41-sececkey.c in Sources */,
                                E7EBD75819145DF000D0F062 /* so_01_serverencryption.c in Sources */,
                                4CC92A8415A3ABD400C6D578 /* si-40-seckey.c in Sources */,
                                4CC92A8515A3ABD400C6D578 /* si-41-sececkey.c in Sources */,
                                E7EBD75819145DF000D0F062 /* so_01_serverencryption.c in Sources */,
@@ -2952,20 +2901,14 @@
                                4CC92A8715A3ABD400C6D578 /* si-43-persistent.c in Sources */,
                                4CC92A8815A3ABD400C6D578 /* si-50-secrandom.c in Sources */,
                                4CC92A8915A3ABD400C6D578 /* si-60-cms.c in Sources */,
                                4CC92A8715A3ABD400C6D578 /* si-43-persistent.c in Sources */,
                                4CC92A8815A3ABD400C6D578 /* si-50-secrandom.c in Sources */,
                                4CC92A8915A3ABD400C6D578 /* si-60-cms.c in Sources */,
-                               5DE4A7BD17441CCD0036339E /* si-71-mobile-store-policy.c in Sources */,
-                               BECC54E51B98FF0000FB91DC /* si-86-sectrust-eap-tls.c in Sources */,
                                CDB6A8B61A409BBF00646CD6 /* otr-50-roll.c in Sources */,
                                CDB6A8B61A409BBF00646CD6 /* otr-50-roll.c in Sources */,
-                               F953A6A91B43597D006EC5E1 /* si-81-sectrust-appletv.c in Sources */,
                                CDD565A2173193AC00B6B074 /* si-73-secpasswordgenerate.c in Sources */,
                                4CC92A8A15A3ABD400C6D578 /* si-61-pkcs12.c in Sources */,
                                4CC92A8B15A3ABD400C6D578 /* si-62-csr.c in Sources */,
                                4CC92A8E15A3ABD400C6D578 /* si-63-scep.c in Sources */,
                                4CC92A9615A3ABD400C6D578 /* si-64-ossl-cms.c in Sources */,
                                CDD565A2173193AC00B6B074 /* si-73-secpasswordgenerate.c in Sources */,
                                4CC92A8A15A3ABD400C6D578 /* si-61-pkcs12.c in Sources */,
                                4CC92A8B15A3ABD400C6D578 /* si-62-csr.c in Sources */,
                                4CC92A8E15A3ABD400C6D578 /* si-63-scep.c in Sources */,
                                4CC92A9615A3ABD400C6D578 /* si-64-ossl-cms.c in Sources */,
-                               7255A46C1783333D006A8B9A /* si-74-OTAPKISigner.c in Sources */,
-                               7255F91417A973D5004A9F38 /* si-75-AppleIDRecordSigning.c in Sources */,
                                4CC92A9715A3ABD400C6D578 /* si-65-cms-cert-policy.c in Sources */,
                                4CC92A9915A3ABD400C6D578 /* si-66-smime.c in Sources */,
                                4CC92A9715A3ABD400C6D578 /* si-65-cms-cert-policy.c in Sources */,
                                4CC92A9915A3ABD400C6D578 /* si-66-smime.c in Sources */,
-                               4CC92AA415A3ABD400C6D578 /* si-67-sectrust-blacklist.c in Sources */,
                                4CC92AA515A3ABD400C6D578 /* vmdh-40.c in Sources */,
                                4CC92AA615A3ABD400C6D578 /* vmdh-41-example.c in Sources */,
                                4CC92AA715A3ABD400C6D578 /* vmdh-42-example2.c in Sources */,
                                4CC92AA515A3ABD400C6D578 /* vmdh-40.c in Sources */,
                                4CC92AA615A3ABD400C6D578 /* vmdh-41-example.c in Sources */,
                                4CC92AA715A3ABD400C6D578 /* vmdh-42-example2.c in Sources */,
@@ -2980,19 +2923,7 @@
                        files = (
                                4CC92AF915A3BC6B00C6D578 /* sd-10-policytree.c in Sources */,
                                CD95312B19228D8D005A76B2 /* SOSTransportTestTransports.c in Sources */,
                        files = (
                                4CC92AF915A3BC6B00C6D578 /* sd-10-policytree.c in Sources */,
                                CD95312B19228D8D005A76B2 /* SOSTransportTestTransports.c in Sources */,
-                               48FABEE21AD05C7100C061D1 /* secd-90-hsa2.c in Sources */,
-                       );
-                       runOnlyForDeploymentPostprocessing = 0;
-               };
-               5284029C164445760035F320 /* Sources */ = {
-                       isa = PBXSourcesBuildPhase;
-                       buildActionMask = 2147483647;
-                       files = (
-                               CDA9828A197F0C3C006A0A9F /* cloudkeychainproxy.m in Sources */,
-                               528402AE164446410035F320 /* CKDKVSProxy.m in Sources */,
-                               528402AF164446410035F320 /* CKDPersistentState.m in Sources */,
-                               528402B1164446410035F320 /* CKDUserInteraction.m in Sources */,
-                               528402B2164447610035F320 /* SOSCloudKeychainConstants.c in Sources */,
+                               E78A9AB31D34630300006B5B /* secd-95-escrow-persistence.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -3001,14 +2932,20 @@
                        buildActionMask = 2147483647;
                        files = (
                                BE8D228F1ABB7253009A4E18 /* SecCertificate.c in Sources */,
                        buildActionMask = 2147483647;
                        files = (
                                BE8D228F1ABB7253009A4E18 /* SecCertificate.c in Sources */,
+                               EB6432BE1C510A6E00B671F2 /* SecDigest.c in Sources */,
+                               D45FC3E71C9E084B00509CDA /* SecBase64.c in Sources */,
                                BE8D22C21ABBA4D0009A4E18 /* SecCertificatePath.c in Sources */,
                                BE8D22C21ABBA4D0009A4E18 /* SecCertificatePath.c in Sources */,
+                               093F67A61CC1171B0033151D /* SecKeyAdaptors.c in Sources */,
                                BE8D22901ABB725C009A4E18 /* SecPolicy.c in Sources */,
                                BE8D22901ABB725C009A4E18 /* SecPolicy.c in Sources */,
+                               D4704F341C76AEB600E15025 /* SecPolicyLeafCallbacks.c in Sources */,
                                BE8D22911ABB7264009A4E18 /* SecTrust.c in Sources */,
                                BE8D22921ABB726A009A4E18 /* SecTrustSettings.c in Sources */,
                                BE8D22931ABB7272009A4E18 /* SecTrustStore.c in Sources */,
                                BE53FA301B0AC5C300719A63 /* SecKey.c in Sources */,
                                BE53FA311B0AC65500719A63 /* SecECKey.c in Sources */,
                                BE53FA321B0AC65B00719A63 /* SecRSAKey.c in Sources */,
                                BE8D22911ABB7264009A4E18 /* SecTrust.c in Sources */,
                                BE8D22921ABB726A009A4E18 /* SecTrustSettings.c in Sources */,
                                BE8D22931ABB7272009A4E18 /* SecTrustStore.c in Sources */,
                                BE53FA301B0AC5C300719A63 /* SecKey.c in Sources */,
                                BE53FA311B0AC65500719A63 /* SecECKey.c in Sources */,
                                BE53FA321B0AC65B00719A63 /* SecRSAKey.c in Sources */,
+                               D4D9BA2F1C7E611C008785EB /* SecServerEncryptionSupport.c in Sources */,
+                               BE4AC7E01C9386B9002A28FE /* SecSignatureVerificationSupport.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -3021,16 +2958,39 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               CD3F91471A802EBF00E07119 /* Sources */ = {
+               D40771B41C9B4D200016AA66 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               CD5D340D1A80391B00EBF353 /* idskeychainsyncingproxy.m in Sources */,
-                               CDD450111ACF13BC00A37449 /* IDSPersistentState.m in Sources */,
-                               CD5D340B1A80391B00EBF353 /* IDSProxy.m in Sources */,
-                               CD0CB4761A81891300C058A4 /* IDSProxy.h in Sources */,
-                               CDF42C071A884BB10080BB05 /* idksmain.m in Sources */,
-                               CD63ACDB1A805D3E001B5671 /* SOSCloudKeychainConstants.c in Sources */,
+                               09AE116F1CEDA1E4004C617D /* si-44-seckey-ies.m in Sources */,
+                               09EC947F1CEDEA70003E5101 /* si-44-seckey-rsa.m in Sources */,
+                               D4D887531CED0A9100DC7583 /* si-24-sectrust-digicert-malaysia.c in Sources */,
+                               D4D886C21CEB9FC600DC7583 /* si-85-sectrust-ssl-policy.c in Sources */,
+                               D4D887541CED0A9700DC7583 /* si-24-sectrust-diginotar.c in Sources */,
+                               D4D887571CED0B9400DC7583 /* si-27-sectrust-exceptions.c in Sources */,
+                               0982E02C1D19695B0060002E /* si-44-seckey-ec.m in Sources */,
+                               D44C81E81CD1944C00BE9A0D /* si-97-sectrust-path-scoring.m in Sources */,
+                               D4D886F01CEC008600DC7583 /* si-23-sectrust-ocsp.c in Sources */,
+                               D4D8875E1CED490700DC7583 /* si-74-OTAPKISigner.c in Sources */,
+                               D4D886C11CEB9FAC00DC7583 /* si-87-sectrust-name-constraints.c in Sources */,
+                               D4EC94FF1CEA4A870083E753 /* si-20-sectrust-policies.m in Sources */,
+                               D4D887551CED0B7D00DC7583 /* si-24-sectrust-passbook.c in Sources */,
+                               D4D887561CED0B8600DC7583 /* si-26-sectrust-copyproperties.c in Sources */,
+                               D4D886EC1CEBF9C700DC7583 /* si-16-ec-certificate.c in Sources */,
+                               D4D886EB1CEBF9C300DC7583 /* si-15-certificate.c in Sources */,
+                               D4D886F41CED027800DC7583 /* si-24-sectrust-itms.c in Sources */,
+                               D4D886EE1CEC007000DC7583 /* si-21-sectrust-asr.c in Sources */,
+                               D4D887591CED40A500DC7583 /* si-70-sectrust-unified.c in Sources */,
+                               D4D886ED1CEC006100DC7583 /* si-20-sectrust.c in Sources */,
+                               D4D8875F1CED491A00DC7583 /* si-83-seccertificate-sighashalg.c in Sources */,
+                               D4D886F51CED027D00DC7583 /* si-24-sectrust-nist.c in Sources */,
+                               D4D8875A1CED40AA00DC7583 /* si-67-sectrust-blacklist.c in Sources */,
+                               D43CDF731C9C77540020217E /* si-28-sectrustsettings.m in Sources */,
+                               D4D887581CED40A000DC7583 /* si-71-mobile-store-policy.c in Sources */,
+                               D40771BE1C9B50590016AA66 /* si-82-seccertificate-ct.c in Sources */,
+                               D4D886EF1CEC007900DC7583 /* si-22-sectrust-iap.c in Sources */,
+                               D40771BF1C9B50590016AA66 /* si-82-sectrust-ct.m in Sources */,
+                               09D1FC1F1CDCBABF00A82D0D /* si-44-seckey-gen.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -3038,50 +2998,54 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               CDE5F89F1AF025BE0074958E /* SOSAccountRingUpdate.c in Sources */,
                                CDE5F87F1AF025AC0074958E /* SOSRingTypes.c in Sources */,
                                CDE5F8A51AF025D60074958E /* SOSPeerInfoRingState.c in Sources */,
                                CDE5F87F1AF025AC0074958E /* SOSRingTypes.c in Sources */,
                                CDE5F8A51AF025D60074958E /* SOSPeerInfoRingState.c in Sources */,
+                               4838F6C11CB5B061009E8598 /* secToolFileIO.c in Sources */,
                                48A071CF1AD6AEA900728AEF /* SOSPeerInfoSecurityProperties.c in Sources */,
                                CDE5F8B01AF026470074958E /* SOSTransportCircle.c in Sources */,
                                CDE5F8861AF025B30074958E /* SOSGenCount.c in Sources */,
                                48A071CF1AD6AEA900728AEF /* SOSPeerInfoSecurityProperties.c in Sources */,
                                CDE5F8B01AF026470074958E /* SOSTransportCircle.c in Sources */,
                                CDE5F8861AF025B30074958E /* SOSGenCount.c in Sources */,
-                               4802A59616D711060059E5B9 /* SOSUserKeygen.c in Sources */,
-                               CDE5F89A1AF025BE0074958E /* SOSAccount.c in Sources */,
                                489E6E4C1A71A87600D7EB8C /* SOSCircleDer.c in Sources */,
                                4CC929B515A3957800C6D578 /* SOSCircle.c in Sources */,
                                4CC929B715A3957800C6D578 /* SOSPeer.c in Sources */,
                                CDE5F88B1AF025B30074958E /* SOSRingBasic.c in Sources */,
                                489E6E4C1A71A87600D7EB8C /* SOSCircleDer.c in Sources */,
                                4CC929B515A3957800C6D578 /* SOSCircle.c in Sources */,
                                4CC929B715A3957800C6D578 /* SOSPeer.c in Sources */,
                                CDE5F88B1AF025B30074958E /* SOSRingBasic.c in Sources */,
-                               48C7DF9A17FF44EF00904F1A /* SOSAccountCloudParameters.c in Sources */,
-                               E75216AD1AF1F26500DDA573 /* SOSForerunnerSession.c in Sources */,
                                CDE5F8891AF025B30074958E /* SOSRingBackup.c in Sources */,
                                CDE5F8A21AF025D60074958E /* SOSPeerInfoDER.c in Sources */,
                                CDE5F8891AF025B30074958E /* SOSRingBackup.c in Sources */,
                                CDE5F8A21AF025D60074958E /* SOSPeerInfoDER.c in Sources */,
-                               48764AEF17FA36200005C4F1 /* SOSAccountUpdate.c in Sources */,
                                CDE5F8AC1AF026470074958E /* SOSTransport.c in Sources */,
                                CDE5F8AC1AF026470074958E /* SOSTransport.c in Sources */,
-                               CDE5F89E1AF025BE0074958E /* SOSAccountRings.c in Sources */,
+                               E738B7251D11D88C0099E5C5 /* SOSAccountLog.c in Sources */,
+                               E738B7211D11D88C0099E5C5 /* SOSAccountDer.c in Sources */,
                                48E9CDFC1C597FED00574D6B /* SOSSysdiagnose.c in Sources */,
                                48E9CDFC1C597FED00574D6B /* SOSSysdiagnose.c in Sources */,
-                               CDE5F89C1AF025BE0074958E /* SOSAccountBackup.c in Sources */,
-                               48C7DF9617FF351A00904F1A /* SOSAccountPeers.c in Sources */,
                                CDE5F88F1AF025B80074958E /* SOSCircleV2.c in Sources */,
                                CDE5F88F1AF025B80074958E /* SOSCircleV2.c in Sources */,
-                               48FABEDD1AD05C1D00C061D1 /* SOSAccountHSAJoin.c in Sources */,
                                CD773AC61ADDFDDB00C808BA /* SOSTransportBackupPeer.c in Sources */,
                                CD773AC61ADDFDDB00C808BA /* SOSTransportBackupPeer.c in Sources */,
-                               CDE5F8A01AF025BE0074958E /* SOSBackupSliceKeyBag.c in Sources */,
+                               E738B71B1D11D88C0099E5C5 /* SOSAccountTransaction.c in Sources */,
+                               E738B7321D11DAB70099E5C5 /* SOSAccountViewSync.c in Sources */,
                                CDE5F8A81AF025DC0074958E /* SOSECWrapUnwrap.c in Sources */,
                                48FB17021A76F56C00B586C7 /* SOSPeerInfoV2.c in Sources */,
                                E777C71E15B73F9E004044A8 /* SOSInternal.c in Sources */,
                                CDE5F8BA1AF026470074958E /* SOSTransportMessageKVS.c in Sources */,
                                E777C72615B87545004044A8 /* SOSPeerInfo.c in Sources */,
                                CDE5F8A81AF025DC0074958E /* SOSECWrapUnwrap.c in Sources */,
                                48FB17021A76F56C00B586C7 /* SOSPeerInfoV2.c in Sources */,
                                E777C71E15B73F9E004044A8 /* SOSInternal.c in Sources */,
                                CDE5F8BA1AF026470074958E /* SOSTransportMessageKVS.c in Sources */,
                                E777C72615B87545004044A8 /* SOSPeerInfo.c in Sources */,
+                               E738B7201D11D88C0099E5C5 /* SOSAccountCredentials.c in Sources */,
                                CDE5F8B61AF026470074958E /* SOSTransportKeyParameterKVS.c in Sources */,
                                CDE5F8B61AF026470074958E /* SOSTransportKeyParameterKVS.c in Sources */,
-                               48764AE817FA2DD00005C4F1 /* SOSAccountDer.c in Sources */,
+                               E738B72B1D11D88C0099E5C5 /* SOSBackupSliceKeyBag.c in Sources */,
+                               E738B7241D11D88C0099E5C5 /* SOSAccountPersistence.c in Sources */,
+                               E738B71D1D11D88C0099E5C5 /* SOSAccountCircles.c in Sources */,
+                               E738B7221D11D88C0099E5C5 /* SOSAccountFullPeerInfo.c in Sources */,
                                E7217B2715F8131A00D26031 /* SOSCloudKeychainConstants.c in Sources */,
                                4C65154B17B5A08900691B6A /* SOSDigestVector.c in Sources */,
                                E7217B2715F8131A00D26031 /* SOSCloudKeychainConstants.c in Sources */,
                                4C65154B17B5A08900691B6A /* SOSDigestVector.c in Sources */,
+                               E738B7231D11D88C0099E5C5 /* SOSAccountPeers.c in Sources */,
                                E7A634E317FA471500920B67 /* SOSPeerInfoCollections.c in Sources */,
                                48F7DF261A6DB32900046644 /* SOSViews.c in Sources */,
                                E7A634E317FA471500920B67 /* SOSPeerInfoCollections.c in Sources */,
                                48F7DF261A6DB32900046644 /* SOSViews.c in Sources */,
+                               481A95511D1A02AA000B98F5 /* SOSCloudKeychainLogging.c in Sources */,
+                               E738B72A1D11D88C0099E5C5 /* SOSBackupEvent.c in Sources */,
                                E79277E3163B110A0096F3E2 /* SOSFullPeerInfo.c in Sources */,
                                E79277E3163B110A0096F3E2 /* SOSFullPeerInfo.c in Sources */,
-                               5284629B1AE6FCF0004C1BA2 /* SOSBackupEvent.c in Sources */,
                                CDE5F87B1AF025A40074958E /* SOSRingDER.c in Sources */,
                                CDE5F87B1AF025A40074958E /* SOSRingDER.c in Sources */,
+                               E738B71C1D11D88C0099E5C5 /* SOSAccountBackup.c in Sources */,
                                CDE5F8831AF025AC0074958E /* SOSRingV0.c in Sources */,
                                CDE5F87D1AF025AC0074958E /* SOSRingPeerInfoUtils.c in Sources */,
                                CDE5F8AA1AF026130074958E /* SOSTransportMessageIDS.c in Sources */,
                                CDE5F8831AF025AC0074958E /* SOSRingV0.c in Sources */,
                                CDE5F87D1AF025AC0074958E /* SOSRingPeerInfoUtils.c in Sources */,
                                CDE5F8AA1AF026130074958E /* SOSTransportMessageIDS.c in Sources */,
-                               48C7DF9317FF2DB500904F1A /* SOSAccountCredentials.c in Sources */,
+                               E738B7281D11D88C0099E5C5 /* SOSAccountRingUpdate.c in Sources */,
+                               E738B7261D11D88C0099E5C5 /* SOSAccountUpdate.c in Sources */,
+                               E738B71E1D11D88C0099E5C5 /* SOSAccountHSAJoin.c in Sources */,
+                               E738B71A1D11D88C0099E5C5 /* SOSAccount.c in Sources */,
                                52EAF4BE163C52EB00803D0F /* SOSCloudKeychainClient.c in Sources */,
                                CDE5F8B21AF026470074958E /* SOSTransportCircleKVS.c in Sources */,
                                4C8BDD9F17B4FDE100C20EA5 /* SOSManifest.c in Sources */,
                                52EAF4BE163C52EB00803D0F /* SOSCloudKeychainClient.c in Sources */,
                                CDE5F8B21AF026470074958E /* SOSTransportCircleKVS.c in Sources */,
                                4C8BDD9F17B4FDE100C20EA5 /* SOSManifest.c in Sources */,
@@ -3091,11 +3055,12 @@
                                4CBDB30D17B70206002FA799 /* SOSMessage.c in Sources */,
                                CD32776B18F8AEFD006B5280 /* SOSPeerCoder.c in Sources */,
                                CDE5F8B41AF026470074958E /* SOSTransportKeyParameter.c in Sources */,
                                4CBDB30D17B70206002FA799 /* SOSMessage.c in Sources */,
                                CD32776B18F8AEFD006B5280 /* SOSPeerCoder.c in Sources */,
                                CDE5F8B41AF026470074958E /* SOSTransportKeyParameter.c in Sources */,
+                               E738B71F1D11D88C0099E5C5 /* SOSAccountCloudParameters.c in Sources */,
                                CDE5F8811AF025AC0074958E /* SOSRingUtils.c in Sources */,
                                CDE5F8811AF025AC0074958E /* SOSRingUtils.c in Sources */,
-                               48C7DF9817FF360F00904F1A /* SOSAccountFullPeerInfo.c in Sources */,
-                               48764AF517FA3FE50005C4F1 /* SOSAccountCircles.c in Sources */,
                                48764AF217FA3ACF0005C4F1 /* SOSKVSKeys.c in Sources */,
                                48764AF217FA3ACF0005C4F1 /* SOSKVSKeys.c in Sources */,
-                               48764AEC17FA31E50005C4F1 /* SOSAccountPersistence.c in Sources */,
+                               E738B72C1D11D88C0099E5C5 /* SOSUserKeygen.c in Sources */,
+                               4838F6C01CB5B055009E8598 /* secViewDisplay.c in Sources */,
+                               E738B7271D11D88C0099E5C5 /* SOSAccountRings.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -3165,30 +3130,24 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               485FE6BE1CDBED9500C916C5 /* syncbackup.c in Sources */,
                                48279BC51C57FEA20043457C /* keychain_log.c in Sources */,
                                48279BC51C57FEA20043457C /* keychain_log.c in Sources */,
+                               4838F6BE1CB5AA7C009E8598 /* secViewDisplay.c in Sources */,
+                               4899F2EC1C7690DE00762615 /* secToolFileIO.c in Sources */,
+                               E7ACD2FB1D30204E0038050D /* keychain_sync_test.m in Sources */,
                                E7FEFB91169E36D800E18152 /* keychain_sync.c in Sources */,
                                E7FEFB91169E36D800E18152 /* keychain_sync.c in Sources */,
-                               48FEA77C1C53000A0020C148 /* secToolFileIO.c in Sources */,
+                               E739A9DB1D3078D9003C088A /* NSFileHandle+Formatting.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
 /* End PBXSourcesBuildPhase section */
 
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXVariantGroup section */
-               521C0BAC15FA5DA800604B61 /* InfoPlist.strings */ = {
-                       isa = PBXVariantGroup;
-                       children = (
-                               521C0BAD15FA5DA800604B61 /* en */,
-                       );
-                       name = InfoPlist.strings;
-                       sourceTree = "<group>";
-               };
-/* End PBXVariantGroup section */
-
 /* Begin XCBuildConfiguration section */
                0C0BDB5D175687EC00BC1A7E /* Debug */ = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
 /* Begin XCBuildConfiguration section */
                0C0BDB5D175687EC00BC1A7E /* Debug */ = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
+                               CLANG_ENABLE_OBJC_ARC = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                COMBINE_HIDPI_IMAGES = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
@@ -3202,6 +3161,7 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
+                               CLANG_ENABLE_OBJC_ARC = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                COMBINE_HIDPI_IMAGES = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
@@ -3245,7 +3205,16 @@
                                CLANG_WARN_UNREACHABLE_CODE = NO;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                CLANG_WARN_UNREACHABLE_CODE = NO;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
+                               ENABLE_TESTABILITY = YES;
+                               GCC_NO_COMMON_BLOCKS = YES;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "$(inherited)",
+                                       "DEBUG=1",
+                                       "NO_SERVER=1",
+                                       "__KEYCHAINCORE__=1",
+                               );
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
+                               ONLY_ACTIVE_ARCH = YES;
                                RUN_CLANG_STATIC_ANALYZER = YES;
                                SDKROOT = macosx.internal;
                        };
                                RUN_CLANG_STATIC_ANALYZER = YES;
                                SDKROOT = macosx.internal;
                        };
@@ -3261,6 +3230,17 @@
                                CLANG_WARN_UNREACHABLE_CODE = NO;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
                                CLANG_WARN_UNREACHABLE_CODE = NO;
                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                ENABLE_STRICT_OBJC_MSGSEND = YES;
+                               GCC_NO_COMMON_BLOCKS = YES;
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "$(inherited)",
+                                       "NDEBUG=1",
+                                       "__KEYCHAINCORE__=1",
+                               );
+                               "GCC_PREPROCESSOR_DEFINITIONS[sdk=embeddedsimulator*]" = (
+                                       "$(inherited)",
+                                       "NO_SERVER=1",
+                                       "__KEYCHAINCORE__=1",
+                               );
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                RUN_CLANG_STATIC_ANALYZER = YES;
                                SDKROOT = macosx.internal;
                                GCC_WARN_UNDECLARED_SELECTOR = YES;
                                RUN_CLANG_STATIC_ANALYZER = YES;
                                SDKROOT = macosx.internal;
@@ -3322,10 +3302,11 @@
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
                                COMBINE_HIDPI_IMAGES = YES;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
                                COMBINE_HIDPI_IMAGES = YES;
-                               "FRAMEWORK_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
+                               "FRAMEWORK_SEARCH_PATHS[sdk=embeddedsimulator*]" = "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
                                "GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*]" = (
                                        "$(inherited)",
                                        "SECITEM_SHIM_OSX=1",
                                "GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*]" = (
                                        "$(inherited)",
                                        "SECITEM_SHIM_OSX=1",
+                                       "SECTRUST_OSX=1",
                                );
                        };
                        name = Debug;
                                );
                        };
                        name = Debug;
@@ -3335,10 +3316,11 @@
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
                                COMBINE_HIDPI_IMAGES = YES;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
                                COMBINE_HIDPI_IMAGES = YES;
-                               "FRAMEWORK_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
+                               "FRAMEWORK_SEARCH_PATHS[sdk=embeddedsimulator*]" = "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
                                "GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*]" = (
                                        "$(inherited)",
                                        "SECITEM_SHIM_OSX=1",
                                "GCC_PREPROCESSOR_DEFINITIONS[sdk=macosx*]" = (
                                        "$(inherited)",
                                        "SECITEM_SHIM_OSX=1",
+                                       "SECTRUST_OSX=1",
                                );
                        };
                        name = Release;
                                );
                        };
                        name = Release;
@@ -3377,11 +3359,13 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
+                               CLANG_ENABLE_OBJC_ARC = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                );
                                COMBINE_HIDPI_IMAGES = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                );
+                               RUN_CLANG_STATIC_ANALYZER = YES;
                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };
@@ -3389,11 +3373,13 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
+                               CLANG_ENABLE_OBJC_ARC = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                );
                                COMBINE_HIDPI_IMAGES = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                );
+                               RUN_CLANG_STATIC_ANALYZER = YES;
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
@@ -3401,6 +3387,7 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
+                               CLANG_ENABLE_OBJC_ARC = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                COMBINE_HIDPI_IMAGES = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
@@ -3414,6 +3401,7 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
+                               CLANG_ENABLE_OBJC_ARC = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                COMBINE_HIDPI_IMAGES = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
@@ -3423,22 +3411,6 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
-               528402AA164445760035F320 /* Debug */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = 4C5EA365164C791400A136B8 /* lib-arc-only.xcconfig */;
-                       buildSettings = {
-                               COMBINE_HIDPI_IMAGES = YES;
-                       };
-                       name = Debug;
-               };
-               528402AB164445760035F320 /* Release */ = {
-                       isa = XCBuildConfiguration;
-                       baseConfigurationReference = 4C5EA365164C791400A136B8 /* lib-arc-only.xcconfig */;
-                       buildSettings = {
-                               COMBINE_HIDPI_IMAGES = YES;
-                       };
-                       name = Release;
-               };
                BE8D228C1ABB7199009A4E18 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                BE8D228C1ABB7199009A4E18 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
@@ -3446,7 +3418,8 @@
                                COMBINE_HIDPI_IMAGES = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "$(inherited)",
                                COMBINE_HIDPI_IMAGES = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "$(inherited)",
-                                       "SECTRUST_OSX=0",
+                                       "SECITEM_SHIM_OSX=1",
+                                       "SECTRUST_OSX=1",
                                );
                                PRODUCT_NAME = libSecTrustOSX;
                        };
                                );
                                PRODUCT_NAME = libSecTrustOSX;
                        };
@@ -3459,7 +3432,8 @@
                                COMBINE_HIDPI_IMAGES = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "$(inherited)",
                                COMBINE_HIDPI_IMAGES = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "$(inherited)",
-                                       "SECTRUST_OSX=0",
+                                       "SECITEM_SHIM_OSX=1",
+                                       "SECTRUST_OSX=1",
                                );
                                PRODUCT_NAME = libSecTrustOSX;
                        };
                                );
                                PRODUCT_NAME = libSecTrustOSX;
                        };
@@ -3491,29 +3465,43 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
-               CD3F915D1A802EC000E07119 /* Debug */ = {
+               D40771BA1C9B4D200016AA66 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = 4C5EA365164C791400A136B8 /* lib-arc-only.xcconfig */;
+                       baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
                        buildSettings = {
+                               CLANG_ENABLE_OBJC_ARC = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                COMBINE_HIDPI_IMAGES = YES;
+                               COPY_PHASE_STRIP = NO;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                        "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                );
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                        "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                );
+                               "HEADER_SEARCH_PATHS[sdk=macosx*]" = (
+                                       "$(BUILT_PRODUCTS_DIR)",
+                                       "$(PROJECT_DIR)/../utilities",
+                                       "$(PROJECT_DIR)/../regressions",
+                               );
                        };
                        name = Debug;
                };
                        };
                        name = Debug;
                };
-               CD3F915E1A802EC000E07119 /* Release */ = {
+               D40771BB1C9B4D200016AA66 /* Release */ = {
                        isa = XCBuildConfiguration;
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = 4C5EA365164C791400A136B8 /* lib-arc-only.xcconfig */;
+                       baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
                        buildSettings = {
+                               CLANG_ENABLE_OBJC_ARC = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                COMBINE_HIDPI_IMAGES = YES;
+                               COPY_PHASE_STRIP = NO;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                        "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                );
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                        "$(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks",
                                );
+                               "HEADER_SEARCH_PATHS[sdk=macosx*]" = (
+                                       "$(BUILT_PRODUCTS_DIR)",
+                                       "$(PROJECT_DIR)/../regressions",
+                                       "$(PROJECT_DIR)/../utilities",
+                               );
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };
@@ -3545,6 +3533,7 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
+                               CLANG_ENABLE_OBJC_ARC = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                COMBINE_HIDPI_IMAGES = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
@@ -3558,6 +3547,7 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
+                               CLANG_ENABLE_OBJC_ARC = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                COMBINE_HIDPI_IMAGES = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
@@ -3571,6 +3561,7 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
+                               CLANG_ENABLE_OBJC_ARC = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                COMBINE_HIDPI_IMAGES = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
@@ -3643,6 +3634,7 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
+                               CLANG_ENABLE_OBJC_ARC = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                COMBINE_HIDPI_IMAGES = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
@@ -3655,6 +3647,7 @@
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
                        isa = XCBuildConfiguration;
                        baseConfigurationReference = 18270C9914CF1AAD00B05E7F /* lib.xcconfig */;
                        buildSettings = {
+                               CLANG_ENABLE_OBJC_ARC = YES;
                                COMBINE_HIDPI_IMAGES = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                COMBINE_HIDPI_IMAGES = YES;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
@@ -3747,15 +3740,6 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
-               528402A9164445760035F320 /* Build configuration list for PBXNativeTarget "libCloudKeychainProxy" */ = {
-                       isa = XCConfigurationList;
-                       buildConfigurations = (
-                               528402AA164445760035F320 /* Debug */,
-                               528402AB164445760035F320 /* Release */,
-                       );
-                       defaultConfigurationIsVisible = 0;
-                       defaultConfigurationName = Release;
-               };
                BE8D228B1ABB7199009A4E18 /* Build configuration list for PBXNativeTarget "libSecTrustOSX" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                BE8D228B1ABB7199009A4E18 /* Build configuration list for PBXNativeTarget "libSecTrustOSX" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
@@ -3774,11 +3758,11 @@
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                };
-               CD3F915C1A802EC000E07119 /* Build configuration list for PBXNativeTarget "libIDSKeychainSyncingProxy" */ = {
+               D40771B91C9B4D200016AA66 /* Build configuration list for PBXNativeTarget "libSharedRegressions" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                        isa = XCConfigurationList;
                        buildConfigurations = (
-                               CD3F915D1A802EC000E07119 /* Debug */,
-                               CD3F915E1A802EC000E07119 /* Release */,
+                               D40771BA1C9B4D200016AA66 /* Debug */,
+                               D40771BB1C9B4D200016AA66 /* Release */,
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
                        );
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Release;
mirror of Security