Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-04-21 00:48:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update libaxolotl, remove one string conversion

Browse Source 
Previously we would convert a bytebuffer to a string, pass it to
libaxolotl where it would be parsed back into a bytebuffer.

Ideally we would just pass the bytebuffer, but it turns out that
libaxolotl's bytebyffer class is identical but separate from
libtextsecure's bytebuffer class. ¯\_(ツ)_/¯

So instead we pass the underlying array buffer, which is handled
more or less the same way as a bytebuffer, and most importantly,
does not involve any copying.

// FREEBIE
This commit is contained in:
lilia
2015-07-20 12:22:33 -07:00
parent 1ab5af338a
commit af48ca9e4b
3 changed files with 20 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libtextsecure/axolotl_wrapper.js
View File

@@ -5,19 +5,6 @@
textsecure.storage.axolotl = new AxolotlStore();
var axolotlInstance = axolotl.protocol(textsecure.storage.axolotl);
var handlePreKeyWhisperMessage = function(from, message) {
try {
return axolotlInstance.handlePreKeyWhisperMessage(from, message);
} catch(e) {
if (e.message === 'Unknown identity key') {
// create an error that the UI will pick up and ask the
// user if they want to re-negotiate
throw new textsecure.IncomingIdentityKeyError(from, message);
}
throw e;
}
};
window.textsecure = window.textsecure || {};
window.textsecure.protocol_wrapper = {
decrypt: function(source, sourceDevice, type, blob) {
@@ -29,7 +16,15 @@
case textsecure.protobuf.Envelope.Type.PREKEY_BUNDLE:
if (blob.readUint8() != ((3 << 4) | 3))
throw new Error("Bad version byte");
return handlePreKeyWhisperMessage(fromAddress, getString(blob));
var blob = blob.toArrayBuffer();
return axolotlInstance.handlePreKeyWhisperMessage(fromAddress, blob).catch(function(e) {
if (e.message === 'Unknown identity key') {
// create an error that the UI will pick up and ask the
// user if they want to re-negotiate
throw new textsecure.IncomingIdentityKeyError(fromAddress, blob);
}
throw e;
});
default:
return new Promise.reject(new Error("Unknown message type"));
}