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

Fix old chain deletion

Browse source
This commit is contained in:
Matt Corallo 2014-05-14 03:02:47 -04:00
parent 605863ffa3
commit 08093a206d
2 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
js/crypto.js
View file

@ -279,6 +279,25 @@ window.crypto = (function() {
return new Promise(function(resolve) { resolve() }); return new Promise(function(resolve) { resolve() });
} }
var removeOldChains = function(session) {
// Sending ratchets are always removed when we step because we never need them again
// Receiving ratchets are either removed if we step with all keys used up to previousCounter
// and are otherwise added to the oldRatchetList, which we parse here and remove ratchets
// older than a week (we assume the message was lost and move on with our lives at that point)
var newList = [];
for (var i = 0; i < session.oldRatchetList.length; i++) {
var entry = session.oldRatchetList[i];
var ratchet = getString(entry.ephemeralKey);
console.log("Checking old chain with added time " + (entry.added/1000));
if (!objectContainsKeys(session[ratchet].messageKeys) || entry.added < new Date().getTime() - 1000*60*60*24*7) {
delete session[ratchet];
console.log("...deleted");
} else
newList[newList.length] = entry;
}
session.oldRatchetList = newList;
}
var maybeStepRatchet = function(session, remoteKey, previousCounter) { var maybeStepRatchet = function(session, remoteKey, previousCounter) {
if (session[getString(remoteKey)] !== undefined) if (session[getString(remoteKey)] !== undefined)
return new Promise(function(resolve) { resolve() }); return new Promise(function(resolve) { resolve() });
@ -291,7 +310,7 @@ window.crypto = (function() {
var previousRatchet = getString(ratchet.ephemeralKeyPair.pubKey); var previousRatchet = getString(ratchet.ephemeralKeyPair.pubKey);
if (session[previousRatchet] !== undefined) { if (session[previousRatchet] !== undefined) {
ratchet.previousCounter = session[previousRatchet].chainKey.counter; ratchet.previousCounter = session[previousRatchet].chainKey.counter;
delete session[getString(ratchet.ephemeralKeyPair.pubKey)]; delete session[previousRatchet];
} else } else
// TODO: This is just an idiosyncrasy upstream, which we match for testing // TODO: This is just an idiosyncrasy upstream, which we match for testing
// it should be changed upstream to something more reasonable. // it should be changed upstream to something more reasonable.
@ -342,9 +361,9 @@ window.crypto = (function() {
return verifyMACWithVersionByte(toArrayBuffer(messageProto), keys[1], mac, (2 << 4) | 2).then(function() { return verifyMACWithVersionByte(toArrayBuffer(messageProto), keys[1], mac, (2 << 4) | 2).then(function() {
var counter = intToArrayBuffer(message.counter); var counter = intToArrayBuffer(message.counter);
return window.crypto.subtle.decrypt({name: "AES-CTR", counter: counter}, keys[0], toArrayBuffer(message.ciphertext)) return window.crypto.subtle.decrypt({name: "AES-CTR", counter: counter}, keys[0], toArrayBuffer(message.ciphertext))
.then(function(plaintext) { .then(function(plaintext) {
//TODO: removeOldChains(session); removeOldChains(session);
delete session['pendingPreKey']; delete session['pendingPreKey'];
crypto_storage.saveSession(encodedNumber, session); crypto_storage.saveSession(encodedNumber, session);

7
js/test.js
View file

@ -301,8 +301,9 @@ registerOnLoadFunction(function() {
var axolotlTestVectors = function(v, remoteDevice) { var axolotlTestVectors = function(v, remoteDevice) {
var origCreateNewKeyPair = crypto_tests.createNewKeyPair; var origCreateNewKeyPair = crypto_tests.createNewKeyPair;
var doStep; var doStep;
var stepDone;
var stepDone = function(res) { stepDone = function(res) {
if (!res || privKeyQueue.length != 0) { if (!res || privKeyQueue.length != 0) {
crypto_tests.createNewKeyPair = origCreateNewKeyPair; crypto_tests.createNewKeyPair = origCreateNewKeyPair;
return false; return false;
@ -310,7 +311,7 @@ registerOnLoadFunction(function() {
crypto_tests.createNewKeyPair = origCreateNewKeyPair; crypto_tests.createNewKeyPair = origCreateNewKeyPair;
return true; return true;
} else } else
return doStep(); return doStep().then(stepDone);
} }
var privKeyQueue = []; var privKeyQueue = [];
@ -566,5 +567,5 @@ registerOnLoadFunction(function() {
startNextExclusiveTest(); startNextExclusiveTest();
localStorage.clear(); localStorage.clear();
}, 5000); }, 10000);
}); });