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

Update libsignal-protocol-javascript 1.1.10

Browse source 
// FREEBIE
This commit is contained in:
lilia 2017-03-28 11:37:41 -07:00
parent 7a7739a3f6
commit d1114edcd4
2 changed files with 26 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

36
js/libtextsecure.js
View file

@ -35855,32 +35855,14 @@ Internal.SessionRecord = function() {
archiveCurrentState: function() { archiveCurrentState: function() {
var open_session = this.getOpenSession(); var open_session = this.getOpenSession();
if (open_session !== undefined) { if (open_session !== undefined) {
this.closeSession(open_session); console.log('closing session');
open_session.indexInfo.closed = Date.now();
this.updateSessionState(open_session); this.updateSessionState(open_session);
} }
}, },
closeSession: function(session) { promoteState: function(session) {
if (session.indexInfo.closed > -1) { console.log('promoting session');
return; session.indexInfo.closed = -1;
}
console.log('closing session', session.indexInfo.baseKey);
// After this has run, we can still receive messages on ratchet chains which
// were already open (unless we know we dont need them),
// but we cannot send messages or step the ratchet
// Delete current sending ratchet
delete session[util.toString(session.currentRatchet.ephemeralKeyPair.pubKey)];
// Move all receive ratchets to the oldRatchetList to mark them for deletion
for (var i in session) {
if (session[i].chainKey !== undefined && session[i].chainKey.key !== undefined) {
session.oldRatchetList[session.oldRatchetList.length] = {
added: Date.now(), ephemeralKey: i
};
}
}
session.indexInfo.closed = Date.now();
this.removeOldChains(session);
}, },
removeOldChains: function(session) { removeOldChains: function(session) {
// Sending ratchets are always removed when we step because we never need them again // Sending ratchets are always removed when we step because we never need them again
@ -36313,6 +36295,10 @@ SessionCipher.prototype = {
return this.doDecryptWhisperMessage(buffer, session).then(function(plaintext) { return this.doDecryptWhisperMessage(buffer, session).then(function(plaintext) {
return { plaintext: plaintext, session: session }; return { plaintext: plaintext, session: session };
}).catch(function(e) { }).catch(function(e) {
if (e.name === 'MessageCounterError') {
return Promise.reject(e);
}
errors.push(e); errors.push(e);
return this.decryptWithSessionList(buffer, sessionList, errors); return this.decryptWithSessionList(buffer, sessionList, errors);
}.bind(this)); }.bind(this));
@ -36328,6 +36314,10 @@ SessionCipher.prototype = {
var errors = []; var errors = [];
return this.decryptWithSessionList(buffer, record.getSessions(), errors).then(function(result) { return this.decryptWithSessionList(buffer, record.getSessions(), errors).then(function(result) {
return this.getRecord(address).then(function(record) { return this.getRecord(address).then(function(record) {
if (result.session !== record.getOpenSession()) {
record.archiveCurrentState();
record.promoteState(result.session);
}
record.updateSessionState(result.session); record.updateSessionState(result.session);
return this.storage.storeSession(address, record.serialize()).then(function() { return this.storage.storeSession(address, record.serialize()).then(function() {
return result.plaintext; return result.plaintext;

36
libtextsecure/libsignal-protocol.js
View file

@ -35718,32 +35718,14 @@ Internal.SessionRecord = function() {
archiveCurrentState: function() { archiveCurrentState: function() {
var open_session = this.getOpenSession(); var open_session = this.getOpenSession();
if (open_session !== undefined) { if (open_session !== undefined) {
this.closeSession(open_session); console.log('closing session');
open_session.indexInfo.closed = Date.now();
this.updateSessionState(open_session); this.updateSessionState(open_session);
} }
}, },
closeSession: function(session) { promoteState: function(session) {
if (session.indexInfo.closed > -1) { console.log('promoting session');
return; session.indexInfo.closed = -1;
}
console.log('closing session', session.indexInfo.baseKey);
// After this has run, we can still receive messages on ratchet chains which
// were already open (unless we know we dont need them),
// but we cannot send messages or step the ratchet
// Delete current sending ratchet
delete session[util.toString(session.currentRatchet.ephemeralKeyPair.pubKey)];
// Move all receive ratchets to the oldRatchetList to mark them for deletion
for (var i in session) {
if (session[i].chainKey !== undefined && session[i].chainKey.key !== undefined) {
session.oldRatchetList[session.oldRatchetList.length] = {
added: Date.now(), ephemeralKey: i
};
}
}
session.indexInfo.closed = Date.now();
this.removeOldChains(session);
}, },
removeOldChains: function(session) { removeOldChains: function(session) {
// Sending ratchets are always removed when we step because we never need them again // Sending ratchets are always removed when we step because we never need them again
@ -36176,6 +36158,10 @@ SessionCipher.prototype = {
return this.doDecryptWhisperMessage(buffer, session).then(function(plaintext) { return this.doDecryptWhisperMessage(buffer, session).then(function(plaintext) {
return { plaintext: plaintext, session: session }; return { plaintext: plaintext, session: session };
}).catch(function(e) { }).catch(function(e) {
if (e.name === 'MessageCounterError') {
return Promise.reject(e);
}
errors.push(e); errors.push(e);
return this.decryptWithSessionList(buffer, sessionList, errors); return this.decryptWithSessionList(buffer, sessionList, errors);
}.bind(this)); }.bind(this));
@ -36191,6 +36177,10 @@ SessionCipher.prototype = {
var errors = []; var errors = [];
return this.decryptWithSessionList(buffer, record.getSessions(), errors).then(function(result) { return this.decryptWithSessionList(buffer, record.getSessions(), errors).then(function(result) {
return this.getRecord(address).then(function(record) { return this.getRecord(address).then(function(record) {
if (result.session !== record.getOpenSession()) {
record.archiveCurrentState();
record.promoteState(result.session);
}
record.updateSessionState(result.session); record.updateSessionState(result.session);
return this.storage.storeSession(address, record.serialize()).then(function() { return this.storage.storeSession(address, record.serialize()).then(function() {
return result.plaintext; return result.plaintext;