|
|
|
|
@ -164,9 +164,8 @@ namespace Bit.App.Pages
@@ -164,9 +164,8 @@ namespace Bit.App.Pages
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
var kdf = KdfType.PBKDF2_SHA256; |
|
|
|
|
var kdfIterations = 100000; |
|
|
|
|
var email = await _stateService.GetEmailAsync(); |
|
|
|
|
var key = await _cryptoService.MakeKeyAsync(MasterPassword, email, kdf, kdfIterations); |
|
|
|
|
var key = await _cryptoService.MakeKeyAsync(MasterPassword, email, kdf, Constants.KdfIterations); |
|
|
|
|
var masterPasswordHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.ServerAuthorization); |
|
|
|
|
var localMasterPasswordHash = await _cryptoService.HashPasswordAsync(MasterPassword, key, HashPurpose.LocalAuthorization); |
|
|
|
|
|
|
|
|
|
@ -188,7 +187,7 @@ namespace Bit.App.Pages
@@ -188,7 +187,7 @@ namespace Bit.App.Pages
|
|
|
|
|
Key = encKey.Item2.EncryptedString, |
|
|
|
|
MasterPasswordHint = Hint, |
|
|
|
|
Kdf = kdf, |
|
|
|
|
KdfIterations = kdfIterations, |
|
|
|
|
KdfIterations = Constants.KdfIterations, |
|
|
|
|
OrgIdentifier = OrgIdentifier, |
|
|
|
|
Keys = new KeysRequest |
|
|
|
|
{ |
|
|
|
|
@ -203,7 +202,7 @@ namespace Bit.App.Pages
@@ -203,7 +202,7 @@ namespace Bit.App.Pages
|
|
|
|
|
// Set Password and relevant information |
|
|
|
|
await _apiService.SetPasswordAsync(request); |
|
|
|
|
await _stateService.SetKdfTypeAsync(kdf); |
|
|
|
|
await _stateService.SetKdfIterationsAsync(kdfIterations); |
|
|
|
|
await _stateService.SetKdfIterationsAsync(Constants.KdfIterations); |
|
|
|
|
await _cryptoService.SetKeyAsync(key); |
|
|
|
|
await _cryptoService.SetKeyHashAsync(localMasterPasswordHash); |
|
|
|
|
await _cryptoService.SetEncKeyAsync(encKey.Item2.EncryptedString); |
|
|
|
|
|