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

Pass the signaling key into decryptWebSocketMessage

Browse source 
De-couple this file from dependency on storage.
This commit is contained in:
lilia 2015-08-07 14:52:33 -07:00
parent c167fc964d
commit 7d9cf0c167
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
js/libtextsecure.js
View file

@ -37885,8 +37885,7 @@ axolotlInternal.RecipientRecord = function() {
window.textsecure = window.textsecure || {}; window.textsecure = window.textsecure || {};
window.textsecure.crypto = { window.textsecure.crypto = {
// Decrypts message into a raw string // Decrypts message into a raw string
decryptWebsocketMessage: function(message) { decryptWebsocketMessage: function(message, signaling_key) {
var signaling_key = textsecure.storage.get("signaling_key"); //TODO: in crypto_storage
var aes_key = signaling_key.slice(0, 32); var aes_key = signaling_key.slice(0, 32);
var mac_key = signaling_key.slice(32, 32 + 20); var mac_key = signaling_key.slice(32, 32 + 20);

3
libtextsecure/crypto.js
View file

@ -35,8 +35,7 @@
window.textsecure = window.textsecure || {}; window.textsecure = window.textsecure || {};
window.textsecure.crypto = { window.textsecure.crypto = {
// Decrypts message into a raw string // Decrypts message into a raw string
decryptWebsocketMessage: function(message) { decryptWebsocketMessage: function(message, signaling_key) {
var signaling_key = textsecure.storage.get("signaling_key"); //TODO: in crypto_storage
var aes_key = signaling_key.slice(0, 32); var aes_key = signaling_key.slice(0, 32);
var mac_key = signaling_key.slice(32, 32 + 20); var mac_key = signaling_key.slice(32, 32 + 20);