matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-09-10 17:31:53 +03:00
Code Activity

Update the olm library version to 1.3.0

Browse Source
This commit is contained in:
Mark Haines
2016-09-14 14:24:21 +01:00
parent fdb640e361
commit 0cc68bc125
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/crypto/algorithms/megolm.js
View File

@@ -124,7 +124,7 @@ MegolmEncryption.prototype._prepareNewSession = function(room) {
this._olmDevice.addInboundGroupSession(
this._roomId, this._olmDevice.deviceCurve25519Key, session_id,
key.key, key.chain_index
key.key
);
// we're going to share the key with all current members of the room,
@@ -394,8 +394,7 @@ MegolmDecryption.prototype.onRoomKeyEvent = function(event) {
if (!content.room_id ||
!content.session_id ||
!content.session_key ||
content.chain_index === undefined
!content.session_key
) {
console.error("key event is missing fields");
return;
@@ -403,7 +402,7 @@ MegolmDecryption.prototype.onRoomKeyEvent = function(event) {
this._olmDevice.addInboundGroupSession(
content.room_id, event.getSenderKey(), content.session_id,
content.session_key, content.chain_index
content.session_key
);
};