mirror of
https://github.com/bitwarden/android.git
synced 2024-12-20 00:02:58 +03:00
cryptographically secure RNG for password generator
This commit is contained in:
parent
8f1a8e3ce9
commit
fc1b825f46
1 changed files with 13 additions and 3 deletions
|
@ -4,13 +4,13 @@ using System.Linq;
|
|||
using System.Text;
|
||||
using Bit.App.Abstractions;
|
||||
using Plugin.Settings.Abstractions;
|
||||
using PCLCrypto;
|
||||
|
||||
namespace Bit.App.Services
|
||||
{
|
||||
public class PasswordGenerationService : IPasswordGenerationService
|
||||
{
|
||||
private readonly ISettings _settings;
|
||||
private Random _random = new Random();
|
||||
|
||||
public PasswordGenerationService(ISettings settings)
|
||||
{
|
||||
|
@ -104,7 +104,7 @@ namespace Bit.App.Services
|
|||
}
|
||||
|
||||
// Shuffle
|
||||
var positions = positionsBuilder.ToString().ToCharArray().OrderBy(a => _random.Next()).ToArray();
|
||||
var positions = positionsBuilder.ToString().ToCharArray().OrderBy(a => Next(int.MaxValue)).ToArray();
|
||||
|
||||
// Build out other character sets
|
||||
var allCharSet = string.Empty;
|
||||
|
@ -168,11 +168,21 @@ namespace Bit.App.Services
|
|||
break;
|
||||
}
|
||||
|
||||
var randomCharIndex = _random.Next(0, positionChars.Length - 1);
|
||||
var randomCharIndex = Next(positionChars.Length - 1);
|
||||
password.Append(positionChars[randomCharIndex]);
|
||||
}
|
||||
|
||||
return password.ToString();
|
||||
}
|
||||
|
||||
private int Next(int maxValue)
|
||||
{
|
||||
if(maxValue == 0)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
return (int)(WinRTCrypto.CryptographicBuffer.GenerateRandomNumber() % maxValue);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue