mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-25 18:38:27 +03:00
Code Issues Projects Releases Packages Wiki Activity

PBKDF2 is SHA256

Browse source
This commit is contained in:
Kyle Spearrin 2018-08-27 19:56:22 -04:00
parent d278fde5f2
commit 42c21ce892
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/App/Enums/KdfType.cs
View file

@ -2,6 +2,6 @@
{ {
public enum KdfType : short public enum KdfType : short
{ {
PBKDF2 = 0 PBKDF2_SHA256 = 0
} }
} }

2
src/App/Pages/RegisterPage.cs
View file

@ -192,7 +192,7 @@ namespace Bit.App.Pages
return; return;
} }
var kdf = Enums.KdfType.PBKDF2; var kdf = Enums.KdfType.PBKDF2_SHA256;
var kdfIterations = 5000; var kdfIterations = 5000;
var normalizedEmail = EmailCell.Entry.Text.ToLower(); var normalizedEmail = EmailCell.Entry.Text.ToLower();
var key = _cryptoService.MakeKeyFromPassword(PasswordCell.Entry.Text, normalizedEmail, kdf, kdfIterations); var key = _cryptoService.MakeKeyFromPassword(PasswordCell.Entry.Text, normalizedEmail, kdf, kdfIterations);

4
src/App/Services/AuthService.cs
View file

@ -168,7 +168,7 @@ namespace Bit.App.Services
{ {
if(!_kdf.HasValue) if(!_kdf.HasValue)
{ {
_kdf = (KdfType)_settings.GetValueOrDefault(KdfKey, (short)KdfType.PBKDF2); _kdf = (KdfType)_settings.GetValueOrDefault(KdfKey, (short)KdfType.PBKDF2_SHA256);
} }
return _kdf.Value; return _kdf.Value;
} }
@ -269,7 +269,7 @@ namespace Bit.App.Services
public async Task<FullLoginResult> TokenPostAsync(string email, string masterPassword) public async Task<FullLoginResult> TokenPostAsync(string email, string masterPassword)
{ {
Kdf = KdfType.PBKDF2; Kdf = KdfType.PBKDF2_SHA256;
KdfIterations = 5000; KdfIterations = 5000;
var preloginResponse = await _accountsApiRepository.PostPreloginAsync( var preloginResponse = await _accountsApiRepository.PostPreloginAsync(
new PreloginRequest { Email = email }); new PreloginRequest { Email = email });

2
src/App/Services/CryptoService.cs
View file

@ -445,7 +445,7 @@ namespace Bit.App.Services
var saltBytes = Encoding.UTF8.GetBytes(salt); var saltBytes = Encoding.UTF8.GetBytes(salt);
byte[] keyBytes = null; byte[] keyBytes = null;
if(kdf == KdfType.PBKDF2) if(kdf == KdfType.PBKDF2_SHA256)
{ {
if(kdfIterations < 5000) if(kdfIterations < 5000)
{ {