From 5b4aedd4be38d450fa321d93ca9f38664109d5a1 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Wed, 16 Nov 2016 09:22:31 +0000 Subject: [PATCH] Fix bug in verifying megolm event senders 1a03e534bda introduced a bug which mixed up the keys_proved and the keys_claimed. Switch them around again so that megolm messages are correctly tied back to the sending device. --- lib/crypto/algorithms/megolm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/crypto/algorithms/megolm.js b/lib/crypto/algorithms/megolm.js index 7e87ad37cc7..1444f3b5ec1 100644 --- a/lib/crypto/algorithms/megolm.js +++ b/lib/crypto/algorithms/megolm.js @@ -501,7 +501,7 @@ MegolmDecryption.prototype.decryptEvent = function(event) { ); } - event.setClearData(payload, res.keysClaimed, res.keysProved); + event.setClearData(payload, res.keysProved, res.keysClaimed); };