1
0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-12 03:18:26 -06:00

Windows: Add colors (Red, Yellow, Green) to the collected randomness indicator depending on how much entropy was gathered. Code re-factoring.

This commit is contained in:
Mounir IDRASSI
2016-02-11 23:54:35 +01:00
parent 89d238bb32
commit d7d4c98775
5 changed files with 53 additions and 63 deletions

View File

@@ -346,27 +346,7 @@ BOOL CALLBACK ExpandVolProgressDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, L
RandpeekBytes (hwndDlg, randPool, sizeof (randPool),&mouseEventsCounter);
/* conservative estimate: 1 mouse move event brings 1 bit of entropy
* https://security.stackexchange.com/questions/32844/for-how-much-time-should-i-randomly-move-the-mouse-for-generating-encryption-key/32848#32848
*/
if (mouseEntropyGathered == 0xFFFFFFFF)
{
mouseEventsInitialCount = mouseEventsCounter;
mouseEntropyGathered = 0;
}
else
{
if ( mouseEntropyGathered < maxEntropyLevel
&& (mouseEventsCounter >= mouseEventsInitialCount)
&& (mouseEventsCounter - mouseEventsInitialCount) <= maxEntropyLevel)
mouseEntropyGathered = mouseEventsCounter - mouseEventsInitialCount;
else
mouseEntropyGathered = maxEntropyLevel;
SendMessage (hEntropyBar, PBM_SETPOS,
(WPARAM) (mouseEntropyGathered),
0);
}
ProcessEntropyEstimate (hEntropyBar, &mouseEventsInitialCount, mouseEventsCounter, maxEntropyLevel, &mouseEntropyGathered);
if (showRandPool)
StringCbPrintfW (szRndPool, sizeof(szRndPool), L"%08X%08X%08X%08X",