Pass the signaling key into decryptWebSocketMessage

De-couple this file from dependency on storage.
10 years ago · 7d9cf0c167
parent c167fc964d
commit 7d9cf0c167
2 changed files with 2 additions and 4 deletions
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@ -37885,8 +37885,7 @@ axolotlInternal.RecipientRecord = function() {
    window.textsecure = window.textsecure || {};
    window.textsecure.crypto = {
        // Decrypts message into a raw string
-        decryptWebsocketMessage: function(message) {
-            var signaling_key = textsecure.storage.get("signaling_key"); //TODO: in crypto_storage
+        decryptWebsocketMessage: function(message, signaling_key) {
            var aes_key = signaling_key.slice(0, 32);
            var mac_key = signaling_key.slice(32, 32 + 20);

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