1 files changed, 4 insertions, 10 deletions

diff --git a/src/lib/libcrypto/rand/rand_win.c b/src/lib/libcrypto/rand/rand_win.c
index 263068d256..113b58678f 100644
--- a/src/lib/libcrypto/rand/rand_win.c
+++ b/src/lib/libcrypto/rand/rand_win.c
@@ -162,7 +162,6 @@ typedef BOOL (WINAPI *GETCURSORINFO)(PCURSORINFO);
 typedef DWORD (WINAPI *GETQUEUESTATUS)(UINT);
 
 typedef HANDLE (WINAPI *CREATETOOLHELP32SNAPSHOT)(DWORD, DWORD);
-typedef BOOL (WINAPI *CLOSETOOLHELP32SNAPSHOT)(HANDLE);
 typedef BOOL (WINAPI *HEAP32FIRST)(LPHEAPENTRY32, DWORD, DWORD);
 typedef BOOL (WINAPI *HEAP32NEXT)(LPHEAPENTRY32);
 typedef BOOL (WINAPI *HEAP32LIST)(HANDLE, LPHEAPLIST32);
@@ -432,7 +431,7 @@ int RAND_poll(void)
          * This seeding method was proposed in Peter Gutmann, Software
          * Generation of Practically Strong Random Numbers,
          * http://www.usenix.org/publications/library/proceedings/sec98/gutmann.html
-         * revised version at http://www.cryptoengines.com/~peter/06_random.pdf
+     * revised version at http://www.cryptoengines.com/~peter/06_random.pdf
          * (The assignment of entropy estimates below is arbitrary, but based
          * on Peter's analysis the full poll appears to be safe. Additional
          * interactive seeding is encouraged.)
@@ -441,7 +440,6 @@ int RAND_poll(void)
         if (kernel)
                 {
                 CREATETOOLHELP32SNAPSHOT snap;
-                CLOSETOOLHELP32SNAPSHOT close_snap;
                 HANDLE handle;
 
                 HEAP32FIRST heap_first;
@@ -459,8 +457,6 @@ int RAND_poll(void)
 
                 snap = (CREATETOOLHELP32SNAPSHOT)
                         GetProcAddress(kernel, TEXT("CreateToolhelp32Snapshot"));
-                close_snap = (CLOSETOOLHELP32SNAPSHOT)
-                        GetProcAddress(kernel, TEXT("CloseToolhelp32Snapshot"));
                 heap_first = (HEAP32FIRST) GetProcAddress(kernel, TEXT("Heap32First"));
                 heap_next = (HEAP32NEXT) GetProcAddress(kernel, TEXT("Heap32Next"));
                 heaplist_first = (HEAP32LIST) GetProcAddress(kernel, TEXT("Heap32ListFirst"));
@@ -476,7 +472,7 @@ int RAND_poll(void)
                         heaplist_next && process_first && process_next &&
                         thread_first && thread_next && module_first &&
                         module_next && (handle = snap(TH32CS_SNAPALL,0))
-                        != INVALID_HANDLE_VALUE)
+                        != NULL)
                         {
                         /* heap list and heap walking */
                         /* HEAPLIST32 contains 3 fields that will change with
@@ -538,10 +534,8 @@ int RAND_poll(void)
                                 do
                                         RAND_add(&m, m.dwSize, 9);
                                 while (module_next(handle, &m));
-                        if (close_snap)
-                                close_snap(handle);
-                        else
-                                CloseHandle(handle);
+
+                        CloseHandle(handle);
                         }
 
                 FreeLibrary(kernel);