OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Megolm export: Clear bit 63 of the salt

pull/21833/head
Richard van der Hoff 2017-01-19 10:43:41 +00:00
parent 31df78f946
commit 8b60cb9df0
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/MegolmExportEncryption.js
View File

@ -106,6 +106,12 @@ export function encryptMegolmKeyFile(data, password, options) {
const salt = new Uint8Array(16); const salt = new Uint8Array(16);
window.crypto.getRandomValues(salt); window.crypto.getRandomValues(salt);
// clear bit 63 of the salt to stop us hitting the 64-bit counter boundary
// (which would mean we wouldn't be able to decrypt on Android). The loss
// of a single bit of salt is a price we have to pay.
salt[9] &= 0x7f;
const iv = new Uint8Array(16); const iv = new Uint8Array(16);
window.crypto.getRandomValues(iv); window.crypto.getRandomValues(iv);