reference correct default kdf config (#9822)

* reference correct default kdf config * update change kdf references
bitwarden · Jun 25, 2024 · 84c4cd7 · 84c4cd7
1 parent 32161e8
commit 84c4cd7
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/apps/web/src/app/auth/settings/security/change-kdf/change-kdf.component.ts b/apps/web/src/app/auth/settings/security/change-kdf/change-kdf.component.ts
@@ -30,20 +30,24 @@ export class ChangeKdfComponent implements OnInit {
  this.kdfConfig.iterations,
  [
  Validators.required,
- Validators.min(PBKDF2_ITERATIONS.min),
- Validators.max(PBKDF2_ITERATIONS.max),
+ Validators.min(PBKDF2KdfConfig.ITERATIONS.min),
+ Validators.max(PBKDF2KdfConfig.ITERATIONS.max),
  ],
  ],
  memory: [
  null as number,
- [Validators.required, Validators.min(ARGON2_MEMORY.min), Validators.max(ARGON2_MEMORY.max)],
+ [
+ Validators.required,
+ Validators.min(Argon2KdfConfig.MEMORY.min),
+ Validators.max(Argon2KdfConfig.MEMORY.max),
+ ],
  ],
  parallelism: [
  null as number,
  [
  Validators.required,
- Validators.min(ARGON2_PARALLELISM.min),
- Validators.max(ARGON2_PARALLELISM.max),
+ Validators.min(Argon2KdfConfig.PARALLELISM.min),
+ Validators.max(Argon2KdfConfig.PARALLELISM.max),
  ],
  ],
  }),
@@ -91,26 +95,26 @@ export class ChangeKdfComponent implements OnInit {
  config = new PBKDF2KdfConfig();
  validators.iterations = [
  Validators.required,
- Validators.min(PBKDF2_ITERATIONS.min),
- Validators.max(PBKDF2_ITERATIONS.max),
+ Validators.min(PBKDF2KdfConfig.ITERATIONS.min),
+ Validators.max(PBKDF2KdfConfig.ITERATIONS.max),
  ];
  break;
  case KdfType.Argon2id:
  config = new Argon2KdfConfig();
  validators.iterations = [
  Validators.required,
- Validators.min(ARGON2_ITERATIONS.min),
- Validators.max(ARGON2_ITERATIONS.max),
+ Validators.min(Argon2KdfConfig.ITERATIONS.min),
+ Validators.max(Argon2KdfConfig.ITERATIONS.max),
  ];
  validators.memory = [
  Validators.required,
- Validators.min(ARGON2_MEMORY.min),
- Validators.max(ARGON2_MEMORY.max),
+ Validators.min(Argon2KdfConfig.MEMORY.min),
+ Validators.max(Argon2KdfConfig.MEMORY.max),
  ];
  validators.parallelism = [
  Validators.required,
- Validators.min(ARGON2_PARALLELISM.min),
- Validators.max(ARGON2_PARALLELISM.max),
+ Validators.min(Argon2KdfConfig.PARALLELISM.min),
+ Validators.max(Argon2KdfConfig.PARALLELISM.max),
  ];
  break;
  default:

diff --git a/libs/auth/src/angular/input-password/input-password.component.ts b/libs/auth/src/angular/input-password/input-password.component.ts
@@ -6,10 +6,12 @@ import { AuditService } from "@bitwarden/common/abstractions/audit.service";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
-import { PBKDF2KdfConfig } from "@bitwarden/common/auth/models/domain/kdf-config";
+import {
+ DEFAULT_KDF_CONFIG,
+ PBKDF2KdfConfig,
+} from "@bitwarden/common/auth/models/domain/kdf-config";
 import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { DEFAULT_KDF_CONFIG } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { MasterKey } from "@bitwarden/common/types/key";
 import {

diff --git a/libs/auth/src/common/services/pin/pin.service.spec.ts b/libs/auth/src/common/services/pin/pin.service.spec.ts
@@ -1,13 +1,13 @@
 import { mock } from "jest-mock-extended";
 
 import { KdfConfigService } from "@bitwarden/common/auth/abstractions/kdf-config.service";
+import { DEFAULT_KDF_CONFIG } from "@bitwarden/common/auth/models/domain/kdf-config";
 import { FakeMasterPasswordService } from "@bitwarden/common/auth/services/master-password/fake-master-password.service";
 import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { KeyGenerationService } from "@bitwarden/common/platform/abstractions/key-generation.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
-import { DEFAULT_KDF_CONFIG } from "@bitwarden/common/platform/enums";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";