mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Handle provisioning messages with no profile key (#1470)

Browse source 
This can happen while linking to an older mobile client.

// FREEBIE
This commit is contained in:
Lilia 2017-09-13 20:26:26 +02:00 • committed by Scott Nonnenberg
parent c832324cb9
commit fc952fbaf6
No known key found for this signature in database
GPG key ID: A4931C09644C654B
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
js/libtextsecure.js
View file

@ -38261,7 +38261,9 @@ var TextSecureServer = (function() {
textsecure.storage.put('signaling_key', signalingKey); textsecure.storage.put('signaling_key', signalingKey);
textsecure.storage.put('password', password); textsecure.storage.put('password', password);
textsecure.storage.put('registrationId', registrationId); textsecure.storage.put('registrationId', registrationId);
if (profileKey) {
textsecure.storage.put('profileKey', profileKey); textsecure.storage.put('profileKey', profileKey);
}
if (userAgent) { if (userAgent) {
textsecure.storage.put('userAgent', userAgent); textsecure.storage.put('userAgent', userAgent);
} }
@ -40282,13 +40284,16 @@ ProvisioningCipher.prototype = {
var privKey = provisionMessage.identityKeyPrivate.toArrayBuffer(); var privKey = provisionMessage.identityKeyPrivate.toArrayBuffer();
return libsignal.Curve.async.createKeyPair(privKey).then(function(keyPair) { return libsignal.Curve.async.createKeyPair(privKey).then(function(keyPair) {
return { var ret = {
identityKeyPair : keyPair, identityKeyPair : keyPair,
number : provisionMessage.number, number : provisionMessage.number,
provisioningCode : provisionMessage.provisioningCode, provisioningCode : provisionMessage.provisioningCode,
userAgent : provisionMessage.userAgent, userAgent : provisionMessage.userAgent,
profileKey : provisionMessage.profileKey.toArrayBuffer()
}; };
if (provisionMessage.profileKey) {
ret.profileKey = provisionMessage.profileKey.toArrayBuffer();
}
return ret;
}); });
}); });
}, },

7
libtextsecure/ProvisioningCipher.js
View file

@ -31,13 +31,16 @@ ProvisioningCipher.prototype = {
var privKey = provisionMessage.identityKeyPrivate.toArrayBuffer(); var privKey = provisionMessage.identityKeyPrivate.toArrayBuffer();
return libsignal.Curve.async.createKeyPair(privKey).then(function(keyPair) { return libsignal.Curve.async.createKeyPair(privKey).then(function(keyPair) {
return { var ret = {
identityKeyPair : keyPair, identityKeyPair : keyPair,
number : provisionMessage.number, number : provisionMessage.number,
provisioningCode : provisionMessage.provisioningCode, provisioningCode : provisionMessage.provisioningCode,
userAgent : provisionMessage.userAgent, userAgent : provisionMessage.userAgent,
profileKey : provisionMessage.profileKey.toArrayBuffer()
}; };
if (provisionMessage.profileKey) {
ret.profileKey = provisionMessage.profileKey.toArrayBuffer();
}
return ret;
}); });
}); });
}, },

2
libtextsecure/account_manager.js
View file

@ -220,7 +220,9 @@
textsecure.storage.put('signaling_key', signalingKey); textsecure.storage.put('signaling_key', signalingKey);
textsecure.storage.put('password', password); textsecure.storage.put('password', password);
textsecure.storage.put('registrationId', registrationId); textsecure.storage.put('registrationId', registrationId);
if (profileKey) {
textsecure.storage.put('profileKey', profileKey); textsecure.storage.put('profileKey', profileKey);
}
if (userAgent) { if (userAgent) {
textsecure.storage.put('userAgent', userAgent); textsecure.storage.put('userAgent', userAgent);
} }