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

Remove decryptWhisperMessage from protocol_wrapper

Browse source 
// FREEBIE
This commit is contained in:
lilia 2016-05-01 14:49:33 -07:00
parent 891ddacd35
commit 8010a09045
3 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
js/libtextsecure.js
View file

@ -35493,13 +35493,6 @@ Internal.SessionLock.queueJobForNumber = function queueJobForNumber(number, runJ
window.textsecure = window.textsecure || {}; window.textsecure = window.textsecure || {};
window.textsecure.protocol_wrapper = { window.textsecure.protocol_wrapper = {
decryptWhisperMessage: function(fromAddress, message) {
return queueJobForNumber(fromAddress, function() {
var address = libsignal.SignalProtocolAddress.fromString(fromAddress);
var sessionCipher = new libsignal.SessionCipher(textsecure.storage.protocol, address);
return sessionCipher.decryptWhisperMessage(message.toArrayBuffer());
});
},
closeOpenSessionForDevice: function(encodedNumber) { closeOpenSessionForDevice: function(encodedNumber) {
return queueJobForNumber(encodedNumber, function() { return queueJobForNumber(encodedNumber, function() {
return protocolInstance.closeOpenSessionForDevice(encodedNumber); return protocolInstance.closeOpenSessionForDevice(encodedNumber);
@ -37134,9 +37127,11 @@ MessageReceiver.prototype.extend({
decrypt: function(envelope, ciphertext) { decrypt: function(envelope, ciphertext) {
var fromAddress = [envelope.source , (envelope.sourceDevice || 0)].join('.'); var fromAddress = [envelope.source , (envelope.sourceDevice || 0)].join('.');
var promise; var promise;
var address = new libsignal.SignalProtocolAddress(envelope.source, envelope.sourceDevice);
var sessionCipher = new libsignal.SessionCipher(textsecure.storage.protocol, address);
switch(envelope.type) { switch(envelope.type) {
case textsecure.protobuf.Envelope.Type.CIPHERTEXT: case textsecure.protobuf.Envelope.Type.CIPHERTEXT:
promise = textsecure.protocol_wrapper.decryptWhisperMessage(fromAddress, ciphertext); promise = sessionCipher.decryptWhisperMessage(ciphertext.toArrayBuffer());
break; break;
case textsecure.protobuf.Envelope.Type.PREKEY_BUNDLE: case textsecure.protobuf.Envelope.Type.PREKEY_BUNDLE:
promise = textsecure.protocol_wrapper.handlePreKeyWhisperMessage(fromAddress, ciphertext); promise = textsecure.protocol_wrapper.handlePreKeyWhisperMessage(fromAddress, ciphertext);

4
libtextsecure/message_receiver.js
View file

@ -111,9 +111,11 @@ MessageReceiver.prototype.extend({
decrypt: function(envelope, ciphertext) { decrypt: function(envelope, ciphertext) {
var fromAddress = [envelope.source , (envelope.sourceDevice || 0)].join('.'); var fromAddress = [envelope.source , (envelope.sourceDevice || 0)].join('.');
var promise; var promise;
var address = new libsignal.SignalProtocolAddress(envelope.source, envelope.sourceDevice);
var sessionCipher = new libsignal.SessionCipher(textsecure.storage.protocol, address);
switch(envelope.type) { switch(envelope.type) {
case textsecure.protobuf.Envelope.Type.CIPHERTEXT: case textsecure.protobuf.Envelope.Type.CIPHERTEXT:
promise = textsecure.protocol_wrapper.decryptWhisperMessage(fromAddress, ciphertext); promise = sessionCipher.decryptWhisperMessage(ciphertext.toArrayBuffer());
break; break;
case textsecure.protobuf.Envelope.Type.PREKEY_BUNDLE: case textsecure.protobuf.Envelope.Type.PREKEY_BUNDLE:
promise = textsecure.protocol_wrapper.handlePreKeyWhisperMessage(fromAddress, ciphertext); promise = textsecure.protocol_wrapper.handlePreKeyWhisperMessage(fromAddress, ciphertext);

7
libtextsecure/protocol_wrapper.js
View file

@ -28,13 +28,6 @@
window.textsecure = window.textsecure || {}; window.textsecure = window.textsecure || {};
window.textsecure.protocol_wrapper = { window.textsecure.protocol_wrapper = {
decryptWhisperMessage: function(fromAddress, message) {
return queueJobForNumber(fromAddress, function() {
var address = libsignal.SignalProtocolAddress.fromString(fromAddress);
var sessionCipher = new libsignal.SessionCipher(textsecure.storage.protocol, address);
return sessionCipher.decryptWhisperMessage(message.toArrayBuffer());
});
},
closeOpenSessionForDevice: function(encodedNumber) { closeOpenSessionForDevice: function(encodedNumber) {
return queueJobForNumber(encodedNumber, function() { return queueJobForNumber(encodedNumber, function() {
return protocolInstance.closeOpenSessionForDevice(encodedNumber); return protocolInstance.closeOpenSessionForDevice(encodedNumber);