vaultwarden
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

cache keyHash, proper param order for cipherString

This commit is contained in:
Kyle Spearrin 2019-04-03 14:18:55 -04:00
parent c63ff4485e
commit 0b0245b90f
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/models/domain/cipherString.ts
View File

@ -16,11 +16,11 @@ export class CipherString {
if (data != null) { if (data != null) {
// data and header // data and header
const encType = encryptedStringOrType as EncryptionType; const encType = encryptedStringOrType as EncryptionType;
this.encryptedString = encType + '.' + data;
// iv
if (iv != null) { if (iv != null) {
this.encryptedString += ('|' + iv); this.encryptedString = encType + '.' + iv + '|' + data;
} else {
this.encryptedString = encType + '.' + data;
} }
// mac // mac

13
src/services/crypto.service.ts
View File

@ -96,12 +96,17 @@ export class CryptoService implements CryptoServiceAbstraction {
return key == null ? null : this.key; return key == null ? null : this.key;
} }
getKeyHash(): Promise<string> { async getKeyHash(): Promise<string> {
if (this.keyHash != null) { if (this.keyHash != null) {
return Promise.resolve(this.keyHash); return this.keyHash;
} }
return this.storageService.get<string>(Keys.keyHash); const keyHash = await this.secureStorageService.get<string>(Keys.keyHash);
if (keyHash != null) {
this.keyHash = keyHash;
}
return keyHash == null ? null : this.keyHash;
} }
@sequentialize(() => 'getEncKey') @sequentialize(() => 'getEncKey')
@ -380,7 +385,7 @@ export class CryptoService implements CryptoServiceAbstraction {
const iv = Utils.fromBufferToB64(encObj.iv); const iv = Utils.fromBufferToB64(encObj.iv);
const data = Utils.fromBufferToB64(encObj.data); const data = Utils.fromBufferToB64(encObj.data);
const mac = encObj.mac != null ? Utils.fromBufferToB64(encObj.mac) : null; const mac = encObj.mac != null ? Utils.fromBufferToB64(encObj.mac) : null;
return new CipherString(encObj.key.encType, iv, data, mac); return new CipherString(encObj.key.encType, data, iv, mac);
} }
async encryptToBytes(plainValue: ArrayBuffer, key?: SymmetricCryptoKey): Promise<ArrayBuffer> { async encryptToBytes(plainValue: ArrayBuffer, key?: SymmetricCryptoKey): Promise<ArrayBuffer> {