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

Use axolotl.api for a few more things in libaxolotl/protocol.js

Browse source
This commit is contained in:
Matt Corallo 2015-01-15 18:29:32 -10:00 • committed by lilia
parent 403ae4376d
commit c1907b14eb
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libaxolotl/protocol.js
View file

@ -43,7 +43,7 @@ window.textsecure.protocol = function() {
var crypto_storage = {}; var crypto_storage = {};
crypto_storage.putKeyPair = function(keyName, keyPair) { crypto_storage.putKeyPair = function(keyName, keyPair) {
textsecure.storage.putEncrypted("25519Key" + keyName, keyPair); axolotl.api.storage.put("25519Key" + keyName, keyPair);
} }
crypto_storage.getNewStoredKeyPair = function(keyName) { crypto_storage.getNewStoredKeyPair = function(keyName) {
@ -54,14 +54,14 @@ window.textsecure.protocol = function() {
} }
crypto_storage.getStoredKeyPair = function(keyName) { crypto_storage.getStoredKeyPair = function(keyName) {
var res = textsecure.storage.getEncrypted("25519Key" + keyName); var res = axolotl.api.storage.get("25519Key" + keyName);
if (res === undefined) if (res === undefined)
return undefined; return undefined;
return { pubKey: toArrayBuffer(res.pubKey), privKey: toArrayBuffer(res.privKey) }; return { pubKey: toArrayBuffer(res.pubKey), privKey: toArrayBuffer(res.privKey) };
} }
crypto_storage.removeStoredKeyPair = function(keyName) { crypto_storage.removeStoredKeyPair = function(keyName) {
textsecure.storage.removeEncrypted("25519Key" + keyName); axolotl.api.storage.remove("25519Key" + keyName);
} }
crypto_storage.getIdentityKey = function() { crypto_storage.getIdentityKey = function() {
@ -583,7 +583,7 @@ window.textsecure.protocol = function() {
var preKeyMsg = new axolotl.protobuf.PreKeyWhisperMessage(); var preKeyMsg = new axolotl.protobuf.PreKeyWhisperMessage();
preKeyMsg.identityKey = toArrayBuffer(crypto_storage.getIdentityKey().pubKey); preKeyMsg.identityKey = toArrayBuffer(crypto_storage.getIdentityKey().pubKey);
preKeyMsg.registrationId = textsecure.storage.getUnencrypted("registrationId"); preKeyMsg.registrationId = axolotl.api.getMyRegistrationId();
if (session === undefined) { if (session === undefined) {
return axolotl.crypto.createKeyPair().then(function(baseKey) { return axolotl.crypto.createKeyPair().then(function(baseKey) {
@ -621,11 +621,11 @@ window.textsecure.protocol = function() {
self.generateKeys = function() { self.generateKeys = function() {
var identityKeyPair = crypto_storage.getIdentityKey(); var identityKeyPair = crypto_storage.getIdentityKey();
var identityKeyCalculated = function(identityKeyPair) { var identityKeyCalculated = function(identityKeyPair) {
var firstPreKeyId = textsecure.storage.getEncrypted("maxPreKeyId", 0); var firstPreKeyId = axolotl.api.storage.get("maxPreKeyId", 0);
textsecure.storage.putEncrypted("maxPreKeyId", firstPreKeyId + GENERATE_KEYS_KEYS_GENERATED); axolotl.api.storage.put("maxPreKeyId", firstPreKeyId + GENERATE_KEYS_KEYS_GENERATED);
var signedKeyId = textsecure.storage.getEncrypted("signedKeyId", 0); var signedKeyId = axolotl.api.storage.get("signedKeyId", 0);
textsecure.storage.putEncrypted("signedKeyId", signedKeyId + 1); axolotl.api.storage.put("signedKeyId", signedKeyId + 1);
var keys = {}; var keys = {};
keys.identityKey = identityKeyPair.pubKey; keys.identityKey = identityKeyPair.pubKey;

3
libtextsecure/axolotl_wrapper.js
View file

@ -8,6 +8,9 @@
getMyIdentifier: function() { getMyIdentifier: function() {
return textsecure.utils.unencodeNumber(textsecure.storage.getUnencrypted("number_id"))[0]; return textsecure.utils.unencodeNumber(textsecure.storage.getUnencrypted("number_id"))[0];
}, },
getMyRegistrationId: function() {
return textsecure.storage.getUnencrypted("registrationId");
},
isIdentifierSane: function(identifier) { isIdentifierSane: function(identifier) {
return textsecure.utils.isNumberSane(identifier); return textsecure.utils.isNumberSane(identifier);
}, },