signalapp/SignalProtocolKit
signalapp/SignalProtocolKit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

session clearing must be in IdentityKeyStore implementation

Browse Source 
Trying to do it in the protocol will not work with multiple devices,
because we'll only archive the session of the first sending device.

// FREEBIE
This commit is contained in:
Michael Kirk 2017-06-22 17:05:17 -04:00
parent f8f44d143b
commit 8fa5ea8d22
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
AxolotlKit/Classes/SessionCipher.m
View File

@ -124,9 +124,7 @@ static dispatch_queue_t _sessionCipherDispatchQueue;
userInfo:@{}];
}
if ([self.identityKeyStore saveRemoteIdentity:sessionState.remoteIdentityKey recipientId:self.recipientId]) {
[sessionRecord removePreviousSessionStates];
}
[self.identityKeyStore saveRemoteIdentity:sessionState.remoteIdentityKey recipientId:self.recipientId];
NSData *ciphertextBody = [AES_CBC encryptCBCMode:paddedMessage withKey:messageKeys.cipherKey withIV:messageKeys.iv];
@ -202,11 +200,8 @@ static dispatch_queue_t _sessionCipherDispatchQueue;
userInfo:@{}];
}
if ([self.identityKeyStore saveRemoteIdentity:sessionRecord.sessionState.remoteIdentityKey
recipientId:self.recipientId]) {
[sessionRecord removePreviousSessionStates];
}
[self.identityKeyStore saveRemoteIdentity:sessionRecord.sessionState.remoteIdentityKey
recipientId:self.recipientId];
[self.sessionStore storeSession:self.recipientId deviceId:self.deviceId session:sessionRecord];
return plaintext;

9
AxolotlKit/Classes/Sessions/SessionBuilder.m
View File

@ -141,14 +141,7 @@ const int kPreKeyOfLastResortId = 0xFFFFFF;
break;
}
BOOL previousIdentityExisted =
[self.identityStore saveRemoteIdentity:theirIdentityKey recipientId:self.recipientId];
if (previousIdentityExisted) {
DDLogInfo(@"%@ PKWM removing previous session states for changed identity for recipient:%@",
self.tag,
self.recipientId);
[sessionRecord removePreviousSessionStates];
}
[self.identityStore saveRemoteIdentity:theirIdentityKey recipientId:self.recipientId];
return unSignedPrekeyId;
}