Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-24 16:49:26 +01:00
Code Issues Projects Releases Wiki Activity

rename all to PBKDF2_SHA256

Browse Source
This commit is contained in:
Kyle Spearrin 2018-08-27 19:58:49 -04:00
parent ae54094fcd
commit 13e0cf0c47
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/angular/components/register.component.ts
View File

@ -59,7 +59,7 @@ export class RegisterComponent {
this.name = this.name === '' ? null : this.name;
this.email = this.email.toLowerCase();
const kdf = KdfType.PBKDF2;
const kdf = KdfType.PBKDF2_SHA256;
const kdfIterations = 5000;
const key = await this.cryptoService.makeKey(this.masterPassword, this.email, kdf, kdfIterations);
const encKey = await this.cryptoService.makeEncKey(key);

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

@ -276,7 +276,7 @@ export class CryptoService implements CryptoServiceAbstraction {
async makeKey(password: string, salt: string, kdf: KdfType, kdfIterations: number):
Promise<SymmetricCryptoKey> {
let key: ArrayBuffer = null;
if (kdf == null || kdf === KdfType.PBKDF2) {
if (kdf == null || kdf === KdfType.PBKDF2_SHA256) {
if (kdfIterations == null) {
kdfIterations = 5000;
} else if (kdfIterations < 5000) {