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

Naively move textsecure.crypto into axolotl.crypto

Browse source
This commit is contained in:
Matt Corallo 2015-01-14 13:55:30 -10:00 • committed by lilia
parent 849fdb7ae4
commit 66cf5b08db
13 changed files with 16433 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libtextsecure/test/protocol_test.js
View file

@ -84,30 +84,30 @@ describe('Protocol', function() {
describe("Axolotl", function() {
var runAxolotlTest = function(v) {
var origCreateKeyPair = textsecure.crypto.createKeyPair;
var origCreateKeyPair = axolotl.crypto.createKeyPair;
var doStep;
var stepDone;
stepDone = function(res) {
if (!res || privKeyQueue.length != 0 || Object.keys(getKeysForNumberMap).length != 0 || Object.keys(messagesSentMap).length != 0) {
textsecure.crypto.createKeyPair = origCreateKeyPair;
axolotl.crypto.createKeyPair = origCreateKeyPair;
return false;
} else if (step == v.length) {
textsecure.crypto.createKeyPair = origCreateKeyPair;
axolotl.crypto.createKeyPair = origCreateKeyPair;
return true;
} else
return doStep().then(stepDone);
}
var privKeyQueue = [];
textsecure.crypto.createKeyPair = function(privKey) {
axolotl.crypto.createKeyPair = function(privKey) {
if (privKey !== undefined)
return origCreateKeyPair(privKey);
if (privKeyQueue.length == 0)
throw new Error('Out of private keys');
else {
var privKey = privKeyQueue.shift();
return textsecure.crypto.createKeyPair(privKey).then(function(keyPair) {
return axolotl.crypto.createKeyPair(privKey).then(function(keyPair) {
var a = btoa(getString(keyPair.privKey)); var b = btoa(getString(privKey));
if (getString(keyPair.privKey) != getString(privKey))
throw new Error('Failed to rederive private key!');
@ -151,13 +151,13 @@ describe('Protocol', function() {
}
if (data.ourIdentityKey !== undefined)
return textsecure.crypto.createKeyPair(data.ourIdentityKey).then(function(keyPair) {
return axolotl.crypto.createKeyPair(data.ourIdentityKey).then(function(keyPair) {
textsecure.storage.putEncrypted("25519KeyidentityKey", keyPair);
return textsecure.crypto.createKeyPair(data.ourSignedPreKey).then(function(keyPair) {
return axolotl.crypto.createKeyPair(data.ourSignedPreKey).then(function(keyPair) {
textsecure.storage.putEncrypted("25519KeysignedKey" + data.signedPreKeyId, keyPair);
if (data.ourPreKey !== undefined)
return textsecure.crypto.createKeyPair(data.ourPreKey).then(function(keyPair) {
return axolotl.crypto.createKeyPair(data.ourPreKey).then(function(keyPair) {
textsecure.storage.putEncrypted("25519KeypreKey" + data.preKeyId, keyPair);
return postLocalKeySetup();
});
@ -204,7 +204,7 @@ describe('Protocol', function() {
privKeyQueue.push(data.ourEphemeralKey);
if (data.ourIdentityKey !== undefined)
return textsecure.crypto.createKeyPair(data.ourIdentityKey).then(function(keyPair) {
return axolotl.crypto.createKeyPair(data.ourIdentityKey).then(function(keyPair) {
textsecure.storage.putEncrypted("25519KeyidentityKey", keyPair);
return postLocalKeySetup();
});