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

use olm from param

Browse Source
This commit is contained in:
Bruno Windels 2020-09-17 18:56:02 +02:00
parent 7d6fcfafa8
commit f58a3ee975
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/matrix/ssss/index.js
View File

@ -47,7 +47,7 @@ export async function readKey(txn) {
return new Key(new KeyDescription(keyData.id, keyAccountData), keyData.binaryKey); return new Key(new KeyDescription(keyData.id, keyAccountData), keyData.binaryKey);
} }
export async function keyFromCredential(type, credential, storage, cryptoDriver) { export async function keyFromCredential(type, credential, storage, cryptoDriver, olm) {
const keyDescription = await readDefaultKeyDescription(storage); const keyDescription = await readDefaultKeyDescription(storage);
if (!keyDescription) { if (!keyDescription) {
throw new Error("Could not find any secret storage key in account data"); throw new Error("Could not find any secret storage key in account data");
@ -56,7 +56,7 @@ export async function keyFromCredential(type, credential, storage, cryptoDriver)
if (type === "passphrase") { if (type === "passphrase") {
key = await keyFromPassphrase(keyDescription, credential, cryptoDriver); key = await keyFromPassphrase(keyDescription, credential, cryptoDriver);
} else if (type === "recoverykey") { } else if (type === "recoverykey") {
key = keyFromRecoveryKey(this._olm, keyDescription, credential); key = keyFromRecoveryKey(olm, keyDescription, credential);
} else { } else {
throw new Error(`Invalid type: ${type}`); throw new Error(`Invalid type: ${type}`);
} }