nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-02-04 14:12:24 +00:00
Code Issues Projects Releases Wiki Activity

Be more sure that state->collecting_entropy can't be spuriously set

Browse Source 
[originally from svn r765]
This commit is contained in:
Simon Tatham 2000-10-25 10:25:10 +00:00
parent 9e6dc1faa1
commit 4aafc6e5c3
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
puttygen.c
View File

@ -322,6 +322,8 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg,
case WM_INITDIALOG: case WM_INITDIALOG:
state = malloc(sizeof(*state)); state = malloc(sizeof(*state));
state->generation_thread_exists = FALSE; state->generation_thread_exists = FALSE;
state->collecting_entropy = FALSE;
state->entropy = NULL;
state->key_exists = FALSE; state->key_exists = FALSE;
SetWindowLong(hwnd, GWL_USERDATA, (LONG)state); SetWindowLong(hwnd, GWL_USERDATA, (LONG)state);
{ {
@ -385,7 +387,9 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg,
return 1; return 1;
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
state = (struct MainDlgState *)GetWindowLong(hwnd, GWL_USERDATA); state = (struct MainDlgState *)GetWindowLong(hwnd, GWL_USERDATA);
if (state->collecting_entropy) { if (state->collecting_entropy &&
state->entropy &&
state->entropy_got < state->entropy_required) {
state->entropy[state->entropy_got++] = lParam; state->entropy[state->entropy_got++] = lParam;
state->entropy[state->entropy_got++] = GetMessageTime(); state->entropy[state->entropy_got++] = GetMessageTime();
SendDlgItemMessage(hwnd, IDC_PROGRESS, PBM_SETPOS, SendDlgItemMessage(hwnd, IDC_PROGRESS, PBM_SETPOS,
@ -400,6 +404,7 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg,
random_add_heavynoise(state->entropy, state->entropy_size); random_add_heavynoise(state->entropy, state->entropy_size);
memset(state->entropy, 0, state->entropy_size); memset(state->entropy, 0, state->entropy_size);
free(state->entropy); free(state->entropy);
state->collecting_entropy = FALSE;
SetDlgItemText(hwnd, IDC_GENERATING, generating_msg); SetDlgItemText(hwnd, IDC_GENERATING, generating_msg);
SendDlgItemMessage(hwnd, IDC_PROGRESS, PBM_SETRANGE, 0, SendDlgItemMessage(hwnd, IDC_PROGRESS, PBM_SETRANGE, 0,
@ -421,7 +426,6 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg,
free(params); free(params);
} else { } else {
state->generation_thread_exists = TRUE; state->generation_thread_exists = TRUE;
state->collecting_entropy = FALSE;
} }
} }
} }