From: Andy Polyakov <appro@openssl.org>
Date: Tue, 19 Jan 2010 20:35:22 +0000 (+0000)
Subject: rand_win.c: fix time limit logic.
X-Git-Tag: OpenSSL-fips-2_0-rc1~1334
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b3020393f207d84f828fd021aa2c999cd434d2cf;p=oweals%2Fopenssl.git

rand_win.c: fix time limit logic.
---

diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c
index 3fac961922..9bad067f43 100644
--- a/crypto/rand/rand_win.c
+++ b/crypto/rand/rand_win.c
@@ -536,7 +536,7 @@ int RAND_poll(void)
 							ex_cnt_limit--;
 						}
 					} while (heaplist_next(handle, &hlist) 
-						&& (GetTickCount()-starttime)<MAXDELAY
+						&& (!good || (GetTickCount()-starttime)<MAXDELAY)
 						&& ex_cnt_limit > 0);
 				}
 
@@ -559,7 +559,7 @@ int RAND_poll(void)
 							&& --entrycnt > 0);
 						}
 					} while (heaplist_next(handle, &hlist) 
-						&& (GetTickCount()-starttime)<MAXDELAY);
+						&& (!good || (GetTickCount()-starttime)<MAXDELAY));
 				}
 #endif
 
@@ -574,7 +574,7 @@ int RAND_poll(void)
 			if (process_first(handle, &p))
 				do
 					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 */
                         /* THREADENTRY32 contains 6 fields that will change
@@ -586,7 +586,7 @@ int RAND_poll(void)
 			if (thread_first(handle, &t))
 				do
 					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 */
                         /* MODULEENTRY32 contains 9 fields that will change
@@ -599,7 +599,7 @@ int RAND_poll(void)
 				do
 					RAND_add(&m, m.dwSize, 9);
 				while (module_next(handle, &m)
-					       	&& (GetTickCount()-starttime)<MAXDELAY);
+					       	&& (!good || (GetTickCount()-starttime)<MAXDELAY));
 			if (close_snap)
 				close_snap(handle);
 			else