colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix interpretation of prekeymsg.registrationId

Browse Source
This commit is contained in:
Matt Corallo
2014-05-14 23:26:46 -04:00
parent 3744b168e5
commit ea1bd535dc
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/crypto.js
View File

@@ -359,8 +359,6 @@ window.crypto = (function() {
var initSessionFromPreKeyWhisperMessage = function(encodedNumber, message) {
var preKeyPair = crypto_storage.getAndRemovePreKeyPair(message.preKeyId);
if (message.registrationId != storage.getUnencrypted("registrationId"))
throw new Error("Got a message encrypted for a different registration");
var session = crypto_storage.getSessionOrIdentityKeyByBaseKey(encodedNumber, toArrayBuffer(message.baseKey));
var open_session = crypto_storage.getOpenSession(encodedNumber);
@@ -608,7 +606,7 @@ window.crypto = (function() {
var preKeyMsg = new PreKeyWhisperMessageProtobuf();
preKeyMsg.identityKey = toArrayBuffer(crypto_storage.getStoredPubKey("identityKey"));
preKeyMsg.preKeyId = deviceObject.preKeyId;
preKeyMsg.registrationId = deviceObject.registrationId;
preKeyMsg.registrationId = storage.getUnencrypted("registrationId");
if (session === undefined) {
return createNewKeyPair(false).then(function(baseKey) {