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

cache key meta data for forge decryption

This commit is contained in:
Kyle Spearrin 2018-05-09 15:48:17 -04:00
parent 9de9c1655c
commit 22894a6876
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/models/domain/symmetricCryptoKey.ts
View File

@ -12,6 +12,8 @@ export class SymmetricCryptoKey {
encKeyB64: string; encKeyB64: string;
macKeyB64: string; macKeyB64: string;
meta: any;
constructor(key: ArrayBuffer, encType?: EncryptionType) { constructor(key: ArrayBuffer, encType?: EncryptionType) {
if (key == null) { if (key == null) {
throw new Error('Must provide key'); throw new Error('Must provide key');

30
src/services/webCryptoFunction.service.ts
View File

@ -40,7 +40,8 @@ export class WebCryptoFunctionService implements CryptoFunctionService {
hash: { name: this.toWebCryptoAlgorithm(algorithm) }, hash: { name: this.toWebCryptoAlgorithm(algorithm) },
}; };
const impKey = await this.subtle.importKey('raw', passwordBuf, { name: 'PBKDF2' }, false, ['deriveBits']); const impKey = await this.subtle.importKey('raw', passwordBuf, { name: 'PBKDF2' } as any,
false, ['deriveBits']);
return await this.subtle.deriveBits(pbkdf2Params, impKey, wcLen); return await this.subtle.deriveBits(pbkdf2Params, impKey, wcLen);
} }
@ -125,23 +126,42 @@ export class WebCryptoFunctionService implements CryptoFunctionService {
} }
async aesEncrypt(data: ArrayBuffer, iv: ArrayBuffer, key: ArrayBuffer): Promise<ArrayBuffer> { async aesEncrypt(data: ArrayBuffer, iv: ArrayBuffer, key: ArrayBuffer): Promise<ArrayBuffer> {
const impKey = await this.subtle.importKey('raw', key, { name: 'AES-CBC' }, false, ['encrypt']); const impKey = await this.subtle.importKey('raw', key, { name: 'AES-CBC' } as any, false, ['encrypt']);
return await this.subtle.encrypt({ name: 'AES-CBC', iv: iv }, impKey, data); return await this.subtle.encrypt({ name: 'AES-CBC', iv: iv }, impKey, data);
} }
aesDecryptFastParameters(data: string, iv: string, mac: string, key: SymmetricCryptoKey): aesDecryptFastParameters(data: string, iv: string, mac: string, key: SymmetricCryptoKey):
DecryptParameters<string> { DecryptParameters<string> {
const p = new DecryptParameters<string>(); const p = new DecryptParameters<string>();
p.encKey = forge.util.decode64(key.encKeyB64); if (key.meta != null) {
p.encKey = key.meta.encKeyByteString;
p.macKey = key.meta.macKeyByteString;
}
if (p.encKey == null) {
p.encKey = forge.util.decode64(key.encKeyB64);
}
p.data = forge.util.decode64(data); p.data = forge.util.decode64(data);
p.iv = forge.util.decode64(iv); p.iv = forge.util.decode64(iv);
p.macData = p.iv + p.data; p.macData = p.iv + p.data;
if (key.macKeyB64 != null) { if (p.macKey == null && key.macKeyB64 != null) {
p.macKey = forge.util.decode64(key.macKeyB64); p.macKey = forge.util.decode64(key.macKeyB64);
} }
if (mac != null) { if (mac != null) {
p.mac = forge.util.decode64(mac); p.mac = forge.util.decode64(mac);
} }
// cache byte string keys for later
if (key.meta == null) {
key.meta = {};
}
if (key.meta.encKeyByteString == null) {
key.meta.encKeyByteString = p.encKey;
}
if (p.macKey != null && key.meta.macKeyByteString == null) {
key.meta.macKeyByteString = p.macKey;
}
return p; return p;
} }
@ -156,7 +176,7 @@ export class WebCryptoFunctionService implements CryptoFunctionService {
} }
async aesDecrypt(data: ArrayBuffer, iv: ArrayBuffer, key: ArrayBuffer): Promise<ArrayBuffer> { async aesDecrypt(data: ArrayBuffer, iv: ArrayBuffer, key: ArrayBuffer): Promise<ArrayBuffer> {
const impKey = await this.subtle.importKey('raw', key, { name: 'AES-CBC' }, false, ['decrypt']); const impKey = await this.subtle.importKey('raw', key, { name: 'AES-CBC' } as any, false, ['decrypt']);
return await this.subtle.decrypt({ name: 'AES-CBC', iv: iv }, impKey, data); return await this.subtle.decrypt({ name: 'AES-CBC', iv: iv }, impKey, data);
} }