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

Generate signed keys (breaks registration)

Browse source
This commit is contained in:
Matt Corallo 2014-07-20 16:28:44 -04:00
parent 4c3ee6f23b
commit 53f8ac9ad9
2 changed files with 63 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

56
js/crypto.js
View file

@ -27,6 +27,7 @@ window.textsecure.crypto = function() {
*** Random constants/utils *** *** Random constants/utils ***
******************************/ ******************************/
// We consider messages lost after a week and might throw away keys at that point // We consider messages lost after a week and might throw away keys at that point
// (also the time between signedPreKey regenerations)
var MESSAGE_LOST_THRESHOLD_MS = 1000*60*60*24*7; var MESSAGE_LOST_THRESHOLD_MS = 1000*60*60*24*7;
var getRandomBytes = function(size) { var getRandomBytes = function(size) {
@ -109,10 +110,10 @@ window.textsecure.crypto = function() {
***************************/ ***************************/
var crypto_storage = {}; var crypto_storage = {};
crypto_storage.getNewPubKeySTORINGPrivKey = function(keyName, isIdentity) { crypto_storage.getNewStoredKeyPair = function(keyName, isIdentity) {
return createNewKeyPair(isIdentity).then(function(keyPair) { return createNewKeyPair(isIdentity).then(function(keyPair) {
textsecure.storage.putEncrypted("25519Key" + keyName, keyPair); textsecure.storage.putEncrypted("25519Key" + keyName, keyPair);
return keyPair.pubKey; return keyPair;
}); });
} }
@ -771,47 +772,52 @@ window.textsecure.crypto = function() {
var GENERATE_KEYS_KEYS_GENERATED = 100; var GENERATE_KEYS_KEYS_GENERATED = 100;
self.generateKeys = function() { self.generateKeys = function() {
var identityKey = crypto_storage.getStoredPubKey("identityKey"); var identityKeyPair = crypto_storage.getStoredKeyPair("identityKey");
var identityKeyCalculated = function(pubKey) { var identityKeyCalculated = function(identityKeyPair) {
identityKey = pubKey; var firstPreKeyId = textsecure.storage.getEncrypted("maxPreKeyId", 0);
textsecure.storage.putEncrypted("maxPreKeyId", firstPreKeyId + GENERATE_KEYS_KEYS_GENERATED);
var firstKeyId = textsecure.storage.getEncrypted("maxPreKeyId", -1) + 1; var signedKeyId = textsecure.storage.getEncrypted("signedKeyId", 0);
textsecure.storage.putEncrypted("maxPreKeyId", firstKeyId + GENERATE_KEYS_KEYS_GENERATED); textsecure.storage.putEncrypted("signedKeyId", signedKeyId + 1);
textsecure.storage.putEncrypted("lastSignedKeyUpdate", Date.now());
if (firstKeyId > 16777000)
return new Promise(function() { throw new Error("You crazy motherfucker") });
var keys = {}; var keys = {};
keys.identityKey = identityKeyPair.pubKey;
keys.keys = []; keys.keys = [];
var generateKey = function(keyId) { var generateKey = function(keyId) {
return crypto_storage.getNewPubKeySTORINGPrivKey("preKey" + keyId, false).then(function(pubKey) { return crypto_storage.getNewStoredKeyPair("preKey" + keyId, false).then(function(keyPair) {
keys.keys[keyId] = {keyId: keyId, publicKey: pubKey, identityKey: identityKey}; keys.keys[keyId] = {keyId: keyId, publicKey: keyPair.pubKey};
}); });
}; };
var promises = []; var promises = [];
for (var i = firstKeyId; i < firstKeyId + GENERATE_KEYS_KEYS_GENERATED; i++) for (var i = firstPreKeyId; i < firstPreKeyId + GENERATE_KEYS_KEYS_GENERATED; i++)
promises[i] = generateKey(i); promises[i] = generateKey(i);
promises[firstPreKeyId + GENERATE_KEYS_KEYS_GENERATED] = crypto_storage.getNewStoredKeyPair("signedKey" + signedKeyId).then(function(keyPair) {
return Ed25519Sign(identityKeyPair.privKey, keyPair.pubKey).then(function(sig) {
keys.signedKey = {keyId: signedKeyId, publicKey: keyPair.pubKey, signature: sig};
});
});
crypto_storage.getAndRemoveStoredKeyPair("signedKey" + (signedKeyId - 2));
return Promise.all(promises).then(function() { return Promise.all(promises).then(function() {
// 0xFFFFFF == 16777215 return keys;
keys.lastResortKey = {keyId: 16777215, publicKey: crypto_storage.getStoredPubKey("preKey16777215"), identityKey: identityKey};//TODO: Rotate lastResortKey
if (keys.lastResortKey.publicKey === undefined) {
return crypto_storage.getNewPubKeySTORINGPrivKey("preKey16777215", false).then(function(pubKey) {
keys.lastResortKey.publicKey = pubKey;
return keys;
});
} else
return keys;
}); });
} }
if (identityKey === undefined) if (identityKeyPair === undefined)
return crypto_storage.getNewPubKeySTORINGPrivKey("identityKey", true).then(function(pubKey) { return identityKeyCalculated(pubKey); }); return crypto_storage.getNewStoredKeyPair("identityKey", true).then(function(keyPair) { return identityKeyCalculated(keyPair); });
else else
return identityKeyCalculated(identityKey); return identityKeyCalculated(identityKeyPair);
} }
window.textsecure.registerOnLoadFunction(function() {
if (textsecure.storage.getEncrypted("lastSignedKeyUpdate", Date.now()) < Date.now() - MESSAGE_LOST_THRESHOLD_MS)
self.generateKeys();
});
self.testing_only = testing_only; self.testing_only = testing_only;
return self; return self;
}(); }();

34
js/test.js
View file

@ -139,14 +139,44 @@ textsecure.registerOnLoadFunction(function() {
return textsecure.crypto.generateKeys().then(function() { return textsecure.crypto.generateKeys().then(function() {
if (textsecure.storage.getEncrypted("25519KeyidentityKey") === undefined) if (textsecure.storage.getEncrypted("25519KeyidentityKey") === undefined)
return false; return false;
if (textsecure.storage.getEncrypted("25519KeypreKey16777215") === undefined) if (textsecure.storage.getEncrypted("25519KeysignedKey0") === undefined)
return false; return false;
for (var i = 0; i < 100; i++) for (var i = 0; i < 100; i++)
if (textsecure.storage.getEncrypted("25519KeypreKey" + i) === undefined) if (textsecure.storage.getEncrypted("25519KeypreKey" + i) === undefined)
return false; return false;
return true; var origIdentityKey = getString(textsecure.storage.getEncrypted("25519KeyidentityKey").privKey);
return textsecure.crypto.generateKeys().then(function() {
if (textsecure.storage.getEncrypted("25519KeyidentityKey") === undefined ||
getString(textsecure.storage.getEncrypted("25519KeyidentityKey").privKey) != origIdentityKey)
return false;
if (textsecure.storage.getEncrypted("25519KeysignedKey0") === undefined ||
textsecure.storage.getEncrypted("25519KeysignedKey1") === undefined)
return false;
for (var i = 0; i < 200; i++)
if (textsecure.storage.getEncrypted("25519KeypreKey" + i) === undefined)
return false;
return textsecure.crypto.generateKeys().then(function() {
if (textsecure.storage.getEncrypted("25519KeyidentityKey") === undefined ||
getString(textsecure.storage.getEncrypted("25519KeyidentityKey").privKey) != origIdentityKey)
return false;
if (textsecure.storage.getEncrypted("25519KeysignedKey0") !== undefined ||
textsecure.storage.getEncrypted("25519KeysignedKey1") === undefined ||
textsecure.storage.getEncrypted("25519KeysignedKey2") === undefined)
return false;
for (var i = 0; i < 300; i++)
if (textsecure.storage.getEncrypted("25519KeypreKey" + i) === undefined)
return false;
return true;
});
});
}); });
}, "Test Identity/Pre Key Creation", true); }, "Test Identity/Pre Key Creation", true);