From 13e0cf0c47430ea009c9cebd41854e51a36f88d6 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 27 Aug 2018 19:58:49 -0400 Subject: [PATCH] rename all to PBKDF2_SHA256 --- src/angular/components/register.component.ts | 2 +- src/services/crypto.service.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/angular/components/register.component.ts b/src/angular/components/register.component.ts index 75df514fe4..d8aedf0e0b 100644 --- a/src/angular/components/register.component.ts +++ b/src/angular/components/register.component.ts @@ -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); diff --git a/src/services/crypto.service.ts b/src/services/crypto.service.ts index dc0890eb31..c66db4c364 100644 --- a/src/services/crypto.service.ts +++ b/src/services/crypto.service.ts @@ -276,7 +276,7 @@ export class CryptoService implements CryptoServiceAbstraction { async makeKey(password: string, salt: string, kdf: KdfType, kdfIterations: number): Promise { 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) {