Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-01-21 21:11:35 +01:00
Code Issues Projects Releases Wiki Activity

use encrypt service in crypto service

Browse Source
This commit is contained in:
Jacob Fink 2023-06-26 09:35:32 -04:00
parent 3adfffeabd
commit 64ca08ef8a
No known key found for this signature in database
GPG Key ID: C2F7ACF05859D008
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/common/src/platform/services/crypto.service.ts
View File

@ -482,7 +482,7 @@ export class CryptoService implements CryptoServiceAbstraction {
const keyPair = await this.cryptoFunctionService.rsaGenerateKeyPair(2048);
const publicB64 = Utils.fromBufferToB64(keyPair[0]);
const privateEnc = await this.encrypt(keyPair[1], key);
const privateEnc = await this.encryptService.encrypt(keyPair[1], key);
return [publicB64, privateEnc];
}
@ -721,7 +721,7 @@ export class CryptoService implements CryptoServiceAbstraction {
key
);
const pinKey = await this.makePinKey(pin, email, kdf, kdfConfig);
await this.stateService.setUserKeyPin(await this.encrypt(key.key, pinKey));
await this.stateService.setUserKeyPin(await this.encryptService.encrypt(key.key, pinKey));
}
protected async shouldStoreKey(keySuffix: KeySuffixOptions, userId?: string) {
@ -818,9 +818,9 @@ export class CryptoService implements CryptoServiceAbstraction {
let protectedSymKey: EncString = null;
if (encryptionKey.key.byteLength === 32) {
const stretchedEncryptionKey = await this.stretchKey(encryptionKey);
protectedSymKey = await this.encrypt(newSymKey, stretchedEncryptionKey);
protectedSymKey = await this.encryptService.encrypt(newSymKey, stretchedEncryptionKey);
} else if (encryptionKey.key.byteLength === 64) {
protectedSymKey = await this.encrypt(newSymKey, encryptionKey);
protectedSymKey = await this.encryptService.encrypt(newSymKey, encryptionKey);
} else {
throw new Error("Invalid key size.");
}