From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 20 Sep 2009 12:38:46 +0000 (+0000)
Subject: Don't use __try+__except unless on VC++
X-Git-Tag: OpenSSL_0_9_8m-beta1~106
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9e6c97703c261ed63025bf9ef618768330d37f74;p=oweals%2Fopenssl.git

Don't use __try+__except unless on VC++
---

diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c
index 25a76cf1ec..efe0f89070 100644
--- a/crypto/rand/rand_win.c
+++ b/crypto/rand/rand_win.c
@@ -497,6 +497,7 @@ int RAND_poll(void)
 			ZeroMemory(&hlist, sizeof(HEAPLIST32));
 			hlist.dwSize = sizeof(HEAPLIST32);		
 			if (good) stoptime = GetTickCount() + MAXDELAY;
+#ifdef _MSC_VER
 			if (heaplist_first(handle, &hlist))
 				{
 				/*
@@ -539,6 +540,29 @@ int RAND_poll(void)
 						&& ex_cnt_limit > 0);
 				}
 
+#else
+			if (heaplist_first(handle, &hlist))
+				{
+				do
+					{
+					RAND_add(&hlist, hlist.dwSize, 3);
+					hentry.dwSize = sizeof(HEAPENTRY32);
+					if (heap_first(&hentry,
+						hlist.th32ProcessID,
+						hlist.th32HeapID))
+						{
+						int entrycnt = 80;
+						do
+							RAND_add(&hentry,
+								hentry.dwSize, 5);
+						while (heap_next(&hentry)
+							&& --entrycnt > 0);
+						}
+					} while (heaplist_next(handle, &hlist) 
+						&& GetTickCount() < stoptime);
+				}
+#endif
+
 			/* process walking */
                         /* PROCESSENTRY32 contains 9 fields that will change
                          * with each entry.  Consider each field a source of