signalapp/libsignal-protocol-javascript
signalapp/libsignal-protocol-javascript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Remove padding/unpadding operations

Browse Source 
These should be handled at the service/application level.
This commit is contained in:
lilia 2016-06-14 19:04:24 -07:00
parent bfdf169ad2
commit 312efe24a2
3 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dist/libsignal-protocol.js vendored
View File

@ -36026,11 +36026,6 @@ SessionCipher.prototype = {
var ourIdentityKey, myRegistrationId, record, session, chain;
var msg = new Internal.protobuf.WhisperMessage();
var paddedPlaintext = new Uint8Array(
this.getPaddedMessageLength(buffer.byteLength + 1) - 1
);
paddedPlaintext.set(new Uint8Array(buffer));
paddedPlaintext[buffer.byteLength] = 0x80;
return Promise.all([
this.storage.getIdentityKeyPair(),
@ -36067,7 +36062,7 @@ SessionCipher.prototype = {
msg.previousCounter = session.currentRatchet.previousCounter;
return Internal.crypto.encrypt(
keys[0], paddedPlaintext.buffer, keys[2].slice(0, 16)
keys[0], buffer, keys[2].slice(0, 16)
).then(function(ciphertext) {
msg.ciphertext = ciphertext;
var encodedMsg = msg.toArrayBuffer();
@ -36228,20 +36223,7 @@ SessionCipher.prototype = {
}.bind(this)).then(function() {
return Internal.crypto.decrypt(keys[0], message.ciphertext.toArrayBuffer(), keys[2].slice(0, 16));
});
}.bind(this)).then(function(paddedPlaintext) {
paddedPlaintext = new Uint8Array(paddedPlaintext);
var plaintext;
for (var i = paddedPlaintext.length - 1; i >= 0; i--) {
if (paddedPlaintext[i] == 0x80) {
plaintext = new Uint8Array(i);
plaintext.set(paddedPlaintext.subarray(0, i));
plaintext = plaintext.buffer;
break;
} else if (paddedPlaintext[i] !== 0x00) {
throw new Error('Invalid padding');
}
}
}.bind(this)).then(function(plaintext) {
delete session.pendingPreKey;
return plaintext;
});

22
src/SessionCipher.js
View File

@ -23,11 +23,6 @@ SessionCipher.prototype = {
var ourIdentityKey, myRegistrationId, record, session, chain;
var msg = new Internal.protobuf.WhisperMessage();
var paddedPlaintext = new Uint8Array(
this.getPaddedMessageLength(buffer.byteLength + 1) - 1
);
paddedPlaintext.set(new Uint8Array(buffer));
paddedPlaintext[buffer.byteLength] = 0x80;
return Promise.all([
this.storage.getIdentityKeyPair(),
@ -64,7 +59,7 @@ SessionCipher.prototype = {
msg.previousCounter = session.currentRatchet.previousCounter;
return Internal.crypto.encrypt(
keys[0], paddedPlaintext.buffer, keys[2].slice(0, 16)
keys[0], buffer, keys[2].slice(0, 16)
).then(function(ciphertext) {
msg.ciphertext = ciphertext;
var encodedMsg = msg.toArrayBuffer();
@ -225,20 +220,7 @@ SessionCipher.prototype = {
}.bind(this)).then(function() {
return Internal.crypto.decrypt(keys[0], message.ciphertext.toArrayBuffer(), keys[2].slice(0, 16));
});
}.bind(this)).then(function(paddedPlaintext) {
paddedPlaintext = new Uint8Array(paddedPlaintext);
var plaintext;
for (var i = paddedPlaintext.length - 1; i >= 0; i--) {
if (paddedPlaintext[i] == 0x80) {
plaintext = new Uint8Array(i);
plaintext.set(paddedPlaintext.subarray(0, i));
plaintext = plaintext.buffer;
break;
} else if (paddedPlaintext[i] !== 0x00) {
throw new Error('Invalid padding');
}
}
}.bind(this)).then(function(plaintext) {
delete session.pendingPreKey;
return plaintext;
});

42
test/SessionCipherTest.js
View File

@ -88,15 +88,51 @@ describe('SessionCipher', function() {
});
}
function getPaddedMessageLength(messageLength) {
var messageLengthWithTerminator = messageLength + 1;
var messagePartCount = Math.floor(messageLengthWithTerminator / 160);
if (messageLengthWithTerminator % 160 !== 0) {
messagePartCount++;
}
return messagePartCount * 160;
}
function pad(plaintext) {
var paddedPlaintext = new Uint8Array(
getPaddedMessageLength(plaintext.byteLength + 1) - 1
);
paddedPlaintext.set(new Uint8Array(plaintext));
paddedPlaintext[plaintext.byteLength] = 0x80;
return paddedPlaintext.buffer;
}
function unpad(paddedPlaintext) {
paddedPlaintext = new Uint8Array(paddedPlaintext);
var plaintext;
for (var i = paddedPlaintext.length - 1; i >= 0; i--) {
if (paddedPlaintext[i] == 0x80) {
plaintext = new Uint8Array(i);
plaintext.set(paddedPlaintext.subarray(0, i));
plaintext = plaintext.buffer;
break;
} else if (paddedPlaintext[i] !== 0x00) {
throw new Error('Invalid padding');
}
}
return plaintext;
}
function doReceiveStep(store, data, privKeyQueue, address) {
return setupReceiveStep(store, data, privKeyQueue).then(function() {
var sessionCipher = new libsignal.SessionCipher(store, address);
if (data.type == textsecure.protobuf.IncomingPushMessageSignal.Type.CIPHERTEXT) {
return sessionCipher.decryptWhisperMessage(data.message);
return sessionCipher.decryptWhisperMessage(data.message).then(unpad);
}
else if (data.type == textsecure.protobuf.IncomingPushMessageSignal.Type.PREKEY_BUNDLE) {
return sessionCipher.decryptPreKeyWhisperMessage(data.message);
return sessionCipher.decryptPreKeyWhisperMessage(data.message).then(unpad);
} else {
throw new Error("Unknown data type in test vector");
}
@ -163,7 +199,7 @@ describe('SessionCipher', function() {
}
var sessionCipher = new SessionCipher(store, address);
return sessionCipher.encrypt(proto.toArrayBuffer()).then(function(msg) {
return sessionCipher.encrypt(pad(proto.toArrayBuffer())).then(function(msg) {
//XXX: This should be all we do: isEqual(data.expectedCiphertext, encryptedMsg, false);
if (msg.type == 1) {
return util.isEqual(data.expectedCiphertext, msg.body);