matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-05 23:10:41 +03:00
Code Activity

Indicate which access flow was used

Browse Source
This commit is contained in:
J. Ryan Stinnett
2019-12-05 16:23:00 +00:00
parent 2bdc16b4bd
commit d66dbdea61
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/CrossSigningManager.js
View File

@@ -63,11 +63,14 @@ export const getSecretStorageKey = async ({ keys: keyInfos }) => {
throw new Error("Secret storage access canceled");
}
let key;
const { passphrase } = info;
if (passphrase) {
key = await deriveKey(input, passphrase.salt, passphrase.iterations);
if (input.passphrase) {
key = await deriveKey(
input.passphrase,
info.passphrase.salt,
info.passphrase.iterations,
);
} else {
key = decodeRecoveryKey(input);
key = decodeRecoveryKey(input.recoveryKey);
}
// Save to cache to avoid future prompts in the current session
secretStorageKeys[name] = key;