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

Fix, display (image) attachments

Browse source
This commit is contained in:
Matt Corallo 2014-05-19 03:06:28 -04:00
parent 2820ff8f2d
commit ee2f43aba4
4 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
js/crypto.js
View file

@ -89,7 +89,6 @@ window.textsecure.crypto = new function() {
//TODO: fscking type conversion
return Promise.resolve({ pubKey: prependVersion(toArrayBuffer(curve25519(priv))), privKey: privKey});
}
}
var privToPub = function(privKey, isIdentity) { return testing_only.privToPub(privKey, isIdentity); }
@ -580,8 +579,8 @@ window.textsecure.crypto = new function() {
var aes_key = keys.slice(0, 32);
var mac_key = keys.slice(32, 64);
var iv = encryptedBin.slice(0, 32);
var ciphertext = encryptedBin.slice(32, encryptedBin.byteLength - 32);
var iv = encryptedBin.slice(0, 16);
var ciphertext = encryptedBin.slice(16, encryptedBin.byteLength - 32);
var ivAndCiphertext = encryptedBin.slice(0, encryptedBin.byteLength - 32);
var mac = encryptedBin.slice(encryptedBin.byteLength - 32, encryptedBin.byteLength);