generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rand_win.c: fix time limit logic.

Browse Source
This commit is contained in:
Andy Polyakov 2010-01-19 20:35:22 +00:00
parent 071ef65cfa
commit b3020393f2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crypto/rand/rand_win.c
View File

@ -536,7 +536,7 @@ int RAND_poll(void)
ex_cnt_limit--; ex_cnt_limit--;
} }
} while (heaplist_next(handle, &hlist) } while (heaplist_next(handle, &hlist)
&& (GetTickCount()-starttime)<MAXDELAY && (!good || (GetTickCount()-starttime)<MAXDELAY)
&& ex_cnt_limit > 0); && ex_cnt_limit > 0);
} }
@ -559,7 +559,7 @@ int RAND_poll(void)
&& --entrycnt > 0); && --entrycnt > 0);
} }
} while (heaplist_next(handle, &hlist) } while (heaplist_next(handle, &hlist)
&& (GetTickCount()-starttime)<MAXDELAY); && (!good || (GetTickCount()-starttime)<MAXDELAY));
} }
#endif #endif
@ -574,7 +574,7 @@ int RAND_poll(void)
if (process_first(handle, &p)) if (process_first(handle, &p))
do do
RAND_add(&p, p.dwSize, 9); RAND_add(&p, p.dwSize, 9);
while (process_next(handle, &p) && (GetTickCount()-starttime)<MAXDELAY); while (process_next(handle, &p) && (!good || (GetTickCount()-starttime)<MAXDELAY));
/* thread walking */ /* thread walking */
/* THREADENTRY32 contains 6 fields that will change /* THREADENTRY32 contains 6 fields that will change
@ -586,7 +586,7 @@ int RAND_poll(void)
if (thread_first(handle, &t)) if (thread_first(handle, &t))
do do
RAND_add(&t, t.dwSize, 6); RAND_add(&t, t.dwSize, 6);
while (thread_next(handle, &t) && (GetTickCount()-starttime)<MAXDELAY); while (thread_next(handle, &t) && (!good || (GetTickCount()-starttime)<MAXDELAY));
/* module walking */ /* module walking */
/* MODULEENTRY32 contains 9 fields that will change /* MODULEENTRY32 contains 9 fields that will change
@ -599,7 +599,7 @@ int RAND_poll(void)
do do
RAND_add(&m, m.dwSize, 9); RAND_add(&m, m.dwSize, 9);
while (module_next(handle, &m) while (module_next(handle, &m)
&& (GetTickCount()-starttime)<MAXDELAY); && (!good || (GetTickCount()-starttime)<MAXDELAY));
if (close_snap) if (close_snap)
close_snap(handle); close_snap(handle);
else else