From 6e45f851f2a7905cbd420619b68e32cc16e7d4ca Mon Sep 17 00:00:00 2001 From: Max Radermacher Date: Tue, 26 May 2026 17:48:41 -0500 Subject: [PATCH] Move some account/SVR files --- Signal.xcodeproj/project.pbxproj | 72 +++++-------------- .../AccountEntropyPool.swift | 0 .../AccountEntropyPoolManager.swift | 0 .../AccountKeyStore.swift | 0 .../MasterKey.swift | 0 .../MasterKeySyncManager.swift | 0 .../MockSgxWebsocketConnectionFactory.swift | 0 .../{SVR2 => }/SVR2AuthCredential.swift | 0 .../{SVR2 => }/SVR2PinHash.swift | 0 .../{SVR2 => }/SVR2Shims.swift | 0 .../SVR2WebsocketConfigurator.swift | 0 .../{LocalStorage => }/SVRLocalStorage.swift | 0 .../{SVR2 => }/SecureValueRecovery2Impl.swift | 0 .../SgxWebsocketConfigurator.swift | 0 .../SgxWebsocketConnection.swift | 0 .../SgxWebsocketConnectionFactory.swift | 0 .../StorageService.swift | 0 17 files changed, 16 insertions(+), 56 deletions(-) rename SignalServiceKit/{SecureValueRecovery/AccountEntropyPool => Account}/AccountEntropyPool.swift (100%) rename SignalServiceKit/{SecureValueRecovery/AccountEntropyPool => Account}/AccountEntropyPoolManager.swift (100%) rename SignalServiceKit/{SecureValueRecovery/LocalStorage => Account}/AccountKeyStore.swift (100%) rename SignalServiceKit/{SecureValueRecovery => Account}/MasterKey.swift (100%) rename SignalServiceKit/{SecureValueRecovery => Account}/MasterKeySyncManager.swift (100%) rename SignalServiceKit/{Network/SgxWebsocketConnection/Mocks => SecureValueRecovery}/MockSgxWebsocketConnectionFactory.swift (100%) rename SignalServiceKit/SecureValueRecovery/{SVR2 => }/SVR2AuthCredential.swift (100%) rename SignalServiceKit/SecureValueRecovery/{SVR2 => }/SVR2PinHash.swift (100%) rename SignalServiceKit/SecureValueRecovery/{SVR2 => }/SVR2Shims.swift (100%) rename SignalServiceKit/SecureValueRecovery/{SVR2 => }/SVR2WebsocketConfigurator.swift (100%) rename SignalServiceKit/SecureValueRecovery/{LocalStorage => }/SVRLocalStorage.swift (100%) rename SignalServiceKit/SecureValueRecovery/{SVR2 => }/SecureValueRecovery2Impl.swift (100%) rename SignalServiceKit/{Network/SgxWebsocketConnection => SecureValueRecovery}/SgxWebsocketConfigurator.swift (100%) rename SignalServiceKit/{Network/SgxWebsocketConnection => SecureValueRecovery}/SgxWebsocketConnection.swift (100%) rename SignalServiceKit/{Network/SgxWebsocketConnection => SecureValueRecovery}/SgxWebsocketConnectionFactory.swift (100%) rename SignalServiceKit/{Util => StorageService}/StorageService.swift (100%) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index f4b0643bac..2f83c27fbb 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -10229,15 +10229,6 @@ path = DoubleTapToEdit; sourceTree = ""; }; - 6640DD612ACDD5CD00CE9A8C /* LocalStorage */ = { - isa = PBXGroup; - children = ( - C14D49CD2D667F830033BA69 /* AccountKeyStore.swift */, - 6640DD622ACDD5DE00CE9A8C /* SVRLocalStorage.swift */, - ); - path = LocalStorage; - sourceTree = ""; - }; 6645F30629BF8D1000B58EBD /* AccountAttributes */ = { isa = PBXGroup; children = ( @@ -10368,15 +10359,20 @@ 6673FF6A2978B5B900F96CFD /* SecureValueRecovery */ = { isa = PBXGroup; children = ( - D9EDF2762E4D29F0001D4BEC /* AccountEntropyPool */, - 6640DD612ACDD5CD00CE9A8C /* LocalStorage */, - 66C2B13B2A0E9108008DDE72 /* SVR2 */, - D94AEB392D28837A00B03D7A /* MasterKey.swift */, - 666654202AD0B03F00B23B32 /* MasterKeySyncManager.swift */, + 66C2B14F2A13F0CA008DDE72 /* MockSgxWebsocketConnectionFactory.swift */, 66138FB5298326C7002E0CFE /* SecureValueRecovery.swift */, + 662C440A2A156DF7001F83E2 /* SecureValueRecovery2Impl.swift */, + 66C2B14C2A13E2C7008DDE72 /* SgxWebsocketConfigurator.swift */, + 66C2B14A2A13E2AC008DDE72 /* SgxWebsocketConnection.swift */, + 66C2B1482A13E2A0008DDE72 /* SgxWebsocketConnectionFactory.swift */, + 66C2B13C2A0E9116008DDE72 /* SVR2AuthCredential.swift */, + 50A26F192FB6991F000A2D8B /* SVR2PinHash.swift */, + 669947B92A20129000E4DC0C /* SVR2Shims.swift */, + 66C2B1552A1400E8008DDE72 /* SVR2WebsocketConfigurator.swift */, 66C2B1372A0DB6A9008DDE72 /* SVRAuthCredential.swift */, 6673FF6F2978C40300F96CFD /* SVRAuthCredentialStorage.swift */, 6673FF712979B33800F96CFD /* SVRAuthCredentialStorageImpl.swift */, + 6640DD622ACDD5DE00CE9A8C /* SVRLocalStorage.swift */, 66C2B1352A0DB02E008DDE72 /* SVRUtil.swift */, ); path = SecureValueRecovery; @@ -10719,18 +10715,6 @@ path = V2; sourceTree = ""; }; - 66C2B13B2A0E9108008DDE72 /* SVR2 */ = { - isa = PBXGroup; - children = ( - 662C440A2A156DF7001F83E2 /* SecureValueRecovery2Impl.swift */, - 66C2B13C2A0E9116008DDE72 /* SVR2AuthCredential.swift */, - 50A26F192FB6991F000A2D8B /* SVR2PinHash.swift */, - 669947B92A20129000E4DC0C /* SVR2Shims.swift */, - 66C2B1552A1400E8008DDE72 /* SVR2WebsocketConfigurator.swift */, - ); - path = SVR2; - sourceTree = ""; - }; 66C2B1422A12E043008DDE72 /* SecureValueRecovery */ = { isa = PBXGroup; children = ( @@ -10740,25 +10724,6 @@ path = SecureValueRecovery; sourceTree = ""; }; - 66C2B1472A13E290008DDE72 /* SgxWebsocketConnection */ = { - isa = PBXGroup; - children = ( - 66C2B14E2A13F0BC008DDE72 /* Mocks */, - 66C2B14C2A13E2C7008DDE72 /* SgxWebsocketConfigurator.swift */, - 66C2B14A2A13E2AC008DDE72 /* SgxWebsocketConnection.swift */, - 66C2B1482A13E2A0008DDE72 /* SgxWebsocketConnectionFactory.swift */, - ); - path = SgxWebsocketConnection; - sourceTree = ""; - }; - 66C2B14E2A13F0BC008DDE72 /* Mocks */ = { - isa = PBXGroup; - children = ( - 66C2B14F2A13F0CA008DDE72 /* MockSgxWebsocketConnectionFactory.swift */, - ); - path = Mocks; - sourceTree = ""; - }; 66CD25572B0685CF00139E17 /* Archivers */ = { isa = PBXGroup; children = ( @@ -11654,6 +11619,7 @@ 88E34F2522F269B600966CC2 /* StorageService */ = { isa = PBXGroup; children = ( + F9C5CB12289453B200548EEE /* StorageService.swift */, 88E34F2622F269E900966CC2 /* StorageServiceManager.swift */, 88E34F2822F26CC100966CC2 /* StorageServiceProto+Sync.swift */, D927372C2CD2DD0D00E15D95 /* StorageServiceRecordIkmMigrator.swift */, @@ -14150,15 +14116,6 @@ path = DisappearingMessages; sourceTree = ""; }; - D9EDF2762E4D29F0001D4BEC /* AccountEntropyPool */ = { - isa = PBXGroup; - children = ( - C18D6FDF2D4D8FB40085E3B9 /* AccountEntropyPool.swift */, - D9EDF2772E4D2A1E001D4BEC /* AccountEntropyPoolManager.swift */, - ); - path = AccountEntropyPool; - sourceTree = ""; - }; D9F6553029D6530B002A330A /* SDSCodableModel */ = { isa = PBXGroup; children = ( @@ -15077,11 +15034,16 @@ 6646572F2AC369EB0099DE1C /* PhoneNumberDiscoverabilityManager */, 6659A0242A7C112700066AB7 /* PreKeys */, 661170BF2ABA458800A1B16D /* TSAccountManager */, + C18D6FDF2D4D8FB40085E3B9 /* AccountEntropyPool.swift */, + D9EDF2772E4D2A1E001D4BEC /* AccountEntropyPoolManager.swift */, + C14D49CD2D667F830033BA69 /* AccountKeyStore.swift */, 50F401CB2D483BF40094CA56 /* DeviceId.swift */, 50D6BDEE2ED6724600CC012E /* DeviceType.swift */, D9F399AC2A95798A001599EC /* IdentityKeyChecker.swift */, D9F399B12A96D65D001599EC /* IdentityKeyMismatchManager.swift */, 5033D46629D76BD0007FEADA /* LocalIdentifiers.swift */, + D94AEB392D28837A00B03D7A /* MasterKey.swift */, + 666654202AD0B03F00B23B32 /* MasterKeySyncManager.swift */, 72552EF32C9EF9E7008614AF /* OWSIdentity.swift */, D9CAF74F2A0ACFF20049193A /* PniDistributionParameterBuilder.swift */, C18E3C712A9FF65D003D1CF1 /* PniDistributionSyncMessage.swift */, @@ -15351,7 +15313,6 @@ isa = PBXGroup; children = ( F9C5CAD3289453B200548EEE /* API */, - 66C2B1472A13E290008DDE72 /* SgxWebsocketConnection */, 88DF819328E112F600F8BA80 /* SignalProxy */, 669E8FE528B4149200043D28 /* BaseOWSURLSessionMock.swift */, F9C5CAC4289453B200548EEE /* ChatConnectionManager.swift */, @@ -15537,7 +15498,6 @@ 7634F08C2A21963600BB93D5 /* Sounds.swift */, F9613CDB2981F11400894B55 /* SqliteUtil.swift */, F9C5CB47289453B200548EEE /* SSKPreferences.swift */, - F9C5CB12289453B200548EEE /* StorageService.swift */, 72DB95AD2C8C7C7B00FD2266 /* String+OWS.swift */, F9C5CB09289453B200548EEE /* String+SSK.swift */, 668A010A2C2B602F007B8808 /* StringSanitizer.swift */, diff --git a/SignalServiceKit/SecureValueRecovery/AccountEntropyPool/AccountEntropyPool.swift b/SignalServiceKit/Account/AccountEntropyPool.swift similarity index 100% rename from SignalServiceKit/SecureValueRecovery/AccountEntropyPool/AccountEntropyPool.swift rename to SignalServiceKit/Account/AccountEntropyPool.swift diff --git a/SignalServiceKit/SecureValueRecovery/AccountEntropyPool/AccountEntropyPoolManager.swift b/SignalServiceKit/Account/AccountEntropyPoolManager.swift similarity index 100% rename from SignalServiceKit/SecureValueRecovery/AccountEntropyPool/AccountEntropyPoolManager.swift rename to SignalServiceKit/Account/AccountEntropyPoolManager.swift diff --git a/SignalServiceKit/SecureValueRecovery/LocalStorage/AccountKeyStore.swift b/SignalServiceKit/Account/AccountKeyStore.swift similarity index 100% rename from SignalServiceKit/SecureValueRecovery/LocalStorage/AccountKeyStore.swift rename to SignalServiceKit/Account/AccountKeyStore.swift diff --git a/SignalServiceKit/SecureValueRecovery/MasterKey.swift b/SignalServiceKit/Account/MasterKey.swift similarity index 100% rename from SignalServiceKit/SecureValueRecovery/MasterKey.swift rename to SignalServiceKit/Account/MasterKey.swift diff --git a/SignalServiceKit/SecureValueRecovery/MasterKeySyncManager.swift b/SignalServiceKit/Account/MasterKeySyncManager.swift similarity index 100% rename from SignalServiceKit/SecureValueRecovery/MasterKeySyncManager.swift rename to SignalServiceKit/Account/MasterKeySyncManager.swift diff --git a/SignalServiceKit/Network/SgxWebsocketConnection/Mocks/MockSgxWebsocketConnectionFactory.swift b/SignalServiceKit/SecureValueRecovery/MockSgxWebsocketConnectionFactory.swift similarity index 100% rename from SignalServiceKit/Network/SgxWebsocketConnection/Mocks/MockSgxWebsocketConnectionFactory.swift rename to SignalServiceKit/SecureValueRecovery/MockSgxWebsocketConnectionFactory.swift diff --git a/SignalServiceKit/SecureValueRecovery/SVR2/SVR2AuthCredential.swift b/SignalServiceKit/SecureValueRecovery/SVR2AuthCredential.swift similarity index 100% rename from SignalServiceKit/SecureValueRecovery/SVR2/SVR2AuthCredential.swift rename to SignalServiceKit/SecureValueRecovery/SVR2AuthCredential.swift diff --git a/SignalServiceKit/SecureValueRecovery/SVR2/SVR2PinHash.swift b/SignalServiceKit/SecureValueRecovery/SVR2PinHash.swift similarity index 100% rename from SignalServiceKit/SecureValueRecovery/SVR2/SVR2PinHash.swift rename to SignalServiceKit/SecureValueRecovery/SVR2PinHash.swift diff --git a/SignalServiceKit/SecureValueRecovery/SVR2/SVR2Shims.swift b/SignalServiceKit/SecureValueRecovery/SVR2Shims.swift similarity index 100% rename from SignalServiceKit/SecureValueRecovery/SVR2/SVR2Shims.swift rename to SignalServiceKit/SecureValueRecovery/SVR2Shims.swift diff --git a/SignalServiceKit/SecureValueRecovery/SVR2/SVR2WebsocketConfigurator.swift b/SignalServiceKit/SecureValueRecovery/SVR2WebsocketConfigurator.swift similarity index 100% rename from SignalServiceKit/SecureValueRecovery/SVR2/SVR2WebsocketConfigurator.swift rename to SignalServiceKit/SecureValueRecovery/SVR2WebsocketConfigurator.swift diff --git a/SignalServiceKit/SecureValueRecovery/LocalStorage/SVRLocalStorage.swift b/SignalServiceKit/SecureValueRecovery/SVRLocalStorage.swift similarity index 100% rename from SignalServiceKit/SecureValueRecovery/LocalStorage/SVRLocalStorage.swift rename to SignalServiceKit/SecureValueRecovery/SVRLocalStorage.swift diff --git a/SignalServiceKit/SecureValueRecovery/SVR2/SecureValueRecovery2Impl.swift b/SignalServiceKit/SecureValueRecovery/SecureValueRecovery2Impl.swift similarity index 100% rename from SignalServiceKit/SecureValueRecovery/SVR2/SecureValueRecovery2Impl.swift rename to SignalServiceKit/SecureValueRecovery/SecureValueRecovery2Impl.swift diff --git a/SignalServiceKit/Network/SgxWebsocketConnection/SgxWebsocketConfigurator.swift b/SignalServiceKit/SecureValueRecovery/SgxWebsocketConfigurator.swift similarity index 100% rename from SignalServiceKit/Network/SgxWebsocketConnection/SgxWebsocketConfigurator.swift rename to SignalServiceKit/SecureValueRecovery/SgxWebsocketConfigurator.swift diff --git a/SignalServiceKit/Network/SgxWebsocketConnection/SgxWebsocketConnection.swift b/SignalServiceKit/SecureValueRecovery/SgxWebsocketConnection.swift similarity index 100% rename from SignalServiceKit/Network/SgxWebsocketConnection/SgxWebsocketConnection.swift rename to SignalServiceKit/SecureValueRecovery/SgxWebsocketConnection.swift diff --git a/SignalServiceKit/Network/SgxWebsocketConnection/SgxWebsocketConnectionFactory.swift b/SignalServiceKit/SecureValueRecovery/SgxWebsocketConnectionFactory.swift similarity index 100% rename from SignalServiceKit/Network/SgxWebsocketConnection/SgxWebsocketConnectionFactory.swift rename to SignalServiceKit/SecureValueRecovery/SgxWebsocketConnectionFactory.swift diff --git a/SignalServiceKit/Util/StorageService.swift b/SignalServiceKit/StorageService/StorageService.swift similarity index 100% rename from SignalServiceKit/Util/StorageService.swift rename to SignalServiceKit/StorageService/StorageService.swift