bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-18 09:13:33 +00:00
Code Issues Releases Wiki Activity

no aliasing

Browse Source
This commit is contained in:
Kyle Spearrin
2018-01-09 14:26:29 -05:00
parent 24e5378c97
commit b7a0fbfef5
4 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,3 @@
import * as forge from 'node-forge';
import { EncryptionType } from '../../enums/encryptionType';
import { SymmetricCryptoKeyBuffers } from './symmetricCryptoKeyBuffers';
@@ -13,17 +11,20 @@ export class SymmetricCryptoKey {
macKey: string;
encType: EncryptionType;
keyBuf: SymmetricCryptoKeyBuffers;
forge: any;
constructor(keyBytes: string, b64KeyBytes?: boolean, encType?: EncryptionType) {
this.forge = (window as any).forge;
if (b64KeyBytes) {
keyBytes = forge.util.decode64(keyBytes);
keyBytes = this.forge.util.decode64(keyBytes);
}
if (!keyBytes) {
throw new Error('Must provide keyBytes');
}
const buffer = (forge as any).util.createBuffer(keyBytes);
const buffer = this.forge.util.createBuffer(keyBytes);
if (!buffer || buffer.length() === 0) {
throw new Error('Couldn\'t make buffer');
}
@@ -41,7 +42,7 @@ export class SymmetricCryptoKey {
}
this.key = keyBytes;
this.keyB64 = forge.util.encode64(keyBytes);
this.keyB64 = this.forge.util.encode64(keyBytes);
this.encType = encType;
if (encType === EncryptionType.AesCbc256_B64 && bufferLength === 32) {