mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-12-23 03:25:12 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into bwindels/file-downloads

Browse Source
This commit is contained in:
Bruno Windels 2020-11-10 18:55:27 +01:00
commit d14f485292
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/matrix/e2ee/OlmWorker.js
View File

@ -37,9 +37,15 @@ export class OlmWorker {
account.unpickle("", pickle); account.unpickle("", pickle);
} }
async createOutboundSession(account, newSession, theirIdentityKey, theirOneTimeKey) { async createOutboundOlmSession(account, newSession, theirIdentityKey, theirOneTimeKey) {
const accountPickle = account.pickle(""); const accountPickle = account.pickle("");
const sessionPickle = await this._workerPool.send({type: "olm_create_outbound", accountPickle, theirIdentityKey, theirOneTimeKey}).response(); let randomValues;
if (window.msCrypto) {
randomValues = [
window.msCrypto.getRandomValues(new Uint8Array(64)),
];
}
const sessionPickle = await this._workerPool.send({type: "olm_create_outbound", accountPickle, theirIdentityKey, theirOneTimeKey, randomValues}).response();
newSession.unpickle("", sessionPickle); newSession.unpickle("", sessionPickle);
} }

7
src/platform/web/worker/main.js
View File

@ -142,13 +142,14 @@ class MessageHandler {
}); });
} }
_olmCreateOutbound(accountPickle, theirIdentityKey, theirOneTimeKey) { _olmCreateOutbound(randomValues, accountPickle, theirIdentityKey, theirOneTimeKey) {
return this._toMessage(() => { return this._toMessage(() => {
this._feedRandomValues(randomValues);
const account = new this._olm.Account(); const account = new this._olm.Account();
const newSession = new this._olm.Session(); const newSession = new this._olm.Session();
try { try {
account.unpickle("", accountPickle); account.unpickle("", accountPickle);
newSession.create_outbound(account, newSession, theirIdentityKey, theirOneTimeKey); newSession.create_outbound(account, theirIdentityKey, theirOneTimeKey);
return newSession.pickle(""); return newSession.pickle("");
} finally { } finally {
account.free(); account.free();
@ -168,7 +169,7 @@ class MessageHandler {
} else if (type === "olm_create_account_otks") { } else if (type === "olm_create_account_otks") {
this._sendReply(message, this._olmCreateAccountAndOTKs(message.randomValues, message.otkAmount)); this._sendReply(message, this._olmCreateAccountAndOTKs(message.randomValues, message.otkAmount));
} else if (type === "olm_create_outbound") { } else if (type === "olm_create_outbound") {
this._sendReply(message, this._olmCreateOutbound(message.accountPickle, message.theirIdentityKey, message.theirOneTimeKey)); this._sendReply(message, this._olmCreateOutbound(message.randomValues, message.accountPickle, message.theirIdentityKey, message.theirOneTimeKey));
} }
} }
} }