From 1eb05c1d01dcee59e7501caf34bfb939d2108cc7 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 4 Sep 2018 19:11:14 -0600 Subject: [PATCH] remove unused preKeyLastResort --- SignalServiceKit/src/Account/TSPreKeyManager.m | 4 +--- .../src/Network/API/Requests/OWSRequestFactory.h | 3 +-- .../src/Network/API/Requests/OWSRequestFactory.m | 3 --- .../AxolotlStore/OWSPrimaryStorage+PreKeyStore.h | 3 +-- .../AxolotlStore/OWSPrimaryStorage+PreKeyStore.m | 14 +------------- 5 files changed, 4 insertions(+), 23 deletions(-) diff --git a/SignalServiceKit/src/Account/TSPreKeyManager.m b/SignalServiceKit/src/Account/TSPreKeyManager.m index 98671deab..4add16e3c 100644 --- a/SignalServiceKit/src/Account/TSPreKeyManager.m +++ b/SignalServiceKit/src/Account/TSPreKeyManager.m @@ -146,7 +146,6 @@ static const NSUInteger kMaxPrekeyUpdateFailureCount = 5; NSString *description; if (modeCopy == RefreshPreKeysMode_SignedAndOneTime) { description = @"signed and one-time prekeys"; - PreKeyRecord *lastResortPreKey = [primaryStorage getOrGenerateLastResortKey]; preKeys = [primaryStorage generatePreKeyRecords]; // Store the new one-time keys immediately, before they are sent to the // service to prevent race conditions and other edge cases. @@ -154,8 +153,7 @@ static const NSUInteger kMaxPrekeyUpdateFailureCount = 5; request = [OWSRequestFactory registerPrekeysRequestWithPrekeyArray:preKeys identityKey:identityKeyPair.publicKey - signedPreKey:signedPreKey - preKeyLastResort:lastResortPreKey]; + signedPreKey:signedPreKey]; } else { description = @"just signed prekey"; request = [OWSRequestFactory registerSignedPrekeyRequestWithSignedPreKeyRecord:signedPreKey]; diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h index 29a8a489a..b1dd679a5 100644 --- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h +++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.h @@ -67,8 +67,7 @@ typedef NS_ENUM(NSUInteger, TSVerificationTransport) { TSVerificationTransportVo + (TSRequest *)registerPrekeysRequestWithPrekeyArray:(NSArray *)prekeys identityKey:(NSData *)identityKeyPublic - signedPreKey:(SignedPreKeyRecord *)signedPreKey - preKeyLastResort:(PreKeyRecord *)preKeyLastResort; + signedPreKey:(SignedPreKeyRecord *)signedPreKey; + (TSRequest *)remoteAttestationRequest:(ECKeyPair *)keyPair enclaveId:(NSString *)enclaveId diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m index 67de23c76..3e18e5024 100644 --- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m +++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m @@ -235,12 +235,10 @@ NS_ASSUME_NONNULL_BEGIN + (TSRequest *)registerPrekeysRequestWithPrekeyArray:(NSArray *)prekeys identityKey:(NSData *)identityKeyPublic signedPreKey:(SignedPreKeyRecord *)signedPreKey - preKeyLastResort:(PreKeyRecord *)preKeyLastResort { OWSAssertDebug(prekeys.count > 0); OWSAssertDebug(identityKeyPublic.length > 0); OWSAssertDebug(signedPreKey); - OWSAssertDebug(preKeyLastResort); NSString *path = textSecureKeysAPI; NSString *publicIdentityKey = [[identityKeyPublic prependKeyType] base64EncodedStringWithOptions:0]; @@ -252,7 +250,6 @@ NS_ASSUME_NONNULL_BEGIN method:@"PUT" parameters:@{ @"preKeys" : serializedPrekeyList, - @"lastResortKey" : [self dictionaryFromPreKey:preKeyLastResort], @"signedPreKey" : [self dictionaryFromSignedPreKey:signedPreKey], @"identityKey" : publicIdentityKey }]; diff --git a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+PreKeyStore.h b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+PreKeyStore.h index df892a8bc..0197f66e0 100644 --- a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+PreKeyStore.h +++ b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+PreKeyStore.h @@ -7,8 +7,7 @@ @interface OWSPrimaryStorage (PreKeyStore) -- (NSArray *)generatePreKeyRecords; -- (PreKeyRecord *)getOrGenerateLastResortKey; +- (NSArray *)generatePreKeyRecords; - (void)storePreKeyRecords:(NSArray *)preKeyRecords; @end diff --git a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+PreKeyStore.m b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+PreKeyStore.m index b8737de04..a957baa18 100644 --- a/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+PreKeyStore.m +++ b/SignalServiceKit/src/Storage/AxolotlStore/OWSPrimaryStorage+PreKeyStore.m @@ -16,19 +16,7 @@ @implementation OWSPrimaryStorage (PreKeyStore) -- (PreKeyRecord *)getOrGenerateLastResortKey -{ - if ([self containsPreKey:kPreKeyOfLastResortId]) { - return [self loadPreKey:kPreKeyOfLastResortId]; - } else { - PreKeyRecord *lastResort = - [[PreKeyRecord alloc] initWithId:kPreKeyOfLastResortId keyPair:[Curve25519 generateKeyPair]]; - [self storePreKey:kPreKeyOfLastResortId preKeyRecord:lastResort]; - return lastResort; - } -} - -- (NSArray *)generatePreKeyRecords +- (NSArray *)generatePreKeyRecords; { NSMutableArray *preKeyRecords = [NSMutableArray array];