bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-04 18:53:20 +00:00
Code Issues Releases Wiki Activity

Resolved merge conflicts from vault item encryption.

Browse Source
This commit is contained in:
Todd Martin
2023-09-28 12:37:15 -04:00
parent bd48aa11dc
commit 0ff5c969c3
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/browser/src/vault/popup/components/fido2/fido2.component.ts
View File

@@ -86,14 +86,14 @@ export class Fido2Component implements OnInit, OnDestroy {
this.ciphers = await Promise.all(
message.cipherIds.map(async (cipherId) => {
const cipher = await this.cipherService.get(cipherId);
return cipher.decrypt();
return cipher.decrypt(await this.cipherService.getKeyForCipherKeyDecryption(cipher));
})
);
} else if (message.type === "InformExcludedCredentialRequest") {
this.ciphers = await Promise.all(
message.existingCipherIds.map(async (cipherId) => {
const cipher = await this.cipherService.get(cipherId);
return cipher.decrypt();
return cipher.decrypt(await this.cipherService.getKeyForCipherKeyDecryption(cipher));
})
);
}

4
libs/common/src/vault/services/fido2/fido2-authenticator.service.ts
View File

@@ -131,7 +131,9 @@ export class Fido2AuthenticatorService implements Fido2AuthenticatorServiceAbstr
keyPair = await createKeyPair();
const encrypted = await this.cipherService.get(cipherId);
cipher = await encrypted.decrypt();
cipher = await encrypted.decrypt(
await this.cipherService.getKeyForCipherKeyDecryption(encrypted)
);
fido2Key = await createKeyView(params, keyPair.privateKey);
cipher.login.fido2Keys = [fido2Key];
const reencrypted = await this.cipherService.encrypt(cipher);