Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-12-28 17:57:37 +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:57:45 -04:00
parent 76caf1c580
commit 3e2b220074
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Models/Api/Request/Accounts/KdfRequestModel.cs
View File

@ -18,7 +18,7 @@ namespace Bit.Core.Models.Api
{ {
switch(Kdf.Value) switch(Kdf.Value)
{ {
case KdfType.PBKDF2: case KdfType.PBKDF2_SHA256:
if(KdfIterations.Value < 5000 || KdfIterations.Value > 1_000_000) if(KdfIterations.Value < 5000 || KdfIterations.Value > 1_000_000)
{ {
yield return new ValidationResult("KDF iterations must be between 5000 and 1000000."); yield return new ValidationResult("KDF iterations must be between 5000 and 1000000.");

4
src/Core/Models/Api/Request/Accounts/RegisterRequestModel.cs
View File

@ -33,7 +33,7 @@ namespace Bit.Core.Models.Api
Name = Name, Name = Name,
Email = Email, Email = Email,
MasterPasswordHint = MasterPasswordHint, MasterPasswordHint = MasterPasswordHint,
Kdf = Kdf.GetValueOrDefault(KdfType.PBKDF2), Kdf = Kdf.GetValueOrDefault(KdfType.PBKDF2_SHA256),
KdfIterations = KdfIterations.GetValueOrDefault(5000) KdfIterations = KdfIterations.GetValueOrDefault(5000)
}; };
@ -56,7 +56,7 @@ namespace Bit.Core.Models.Api
{ {
switch(Kdf.Value) switch(Kdf.Value)
{ {
case KdfType.PBKDF2: case KdfType.PBKDF2_SHA256:
if(KdfIterations.Value < 5000 || KdfIterations.Value > 1_000_000) if(KdfIterations.Value < 5000 || KdfIterations.Value > 1_000_000)
{ {
yield return new ValidationResult("KDF iterations must be between 5000 and 1000000."); yield return new ValidationResult("KDF iterations must be between 5000 and 1000000.");

2
src/Core/Models/Table/User.cs
View File

@ -39,7 +39,7 @@ namespace Bit.Core.Models.Table
public string GatewayCustomerId { get; set; } public string GatewayCustomerId { get; set; }
public string GatewaySubscriptionId { get; set; } public string GatewaySubscriptionId { get; set; }
public string LicenseKey { get; set; } public string LicenseKey { get; set; }
public KdfType Kdf { get; set; } = KdfType.PBKDF2; public KdfType Kdf { get; set; } = KdfType.PBKDF2_SHA256;
public int KdfIterations { get; set; } = 5000; public int KdfIterations { get; set; } = 5000;
public DateTime CreationDate { get; internal set; } = DateTime.UtcNow; public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow; public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;