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

Jeffrey Altman <jaltman@columbia.edu> sent me a patch that fixes the

Browse Source 
problems with GetCursorInfo, but also adds network statistics and
performance statistics where available.
This commit is contained in:
Richard Levitte 2000-09-17 18:42:13 +00:00
parent 62324627aa
commit 1d95fb659d
1 changed files with 83 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
crypto/rand/rand_win.c
View File

@ -169,6 +169,12 @@ typedef BOOL (WINAPI *PROCESS32)(HANDLE, LPPROCESSENTRY32);
typedef BOOL (WINAPI *THREAD32)(HANDLE, LPTHREADENTRY32); typedef BOOL (WINAPI *THREAD32)(HANDLE, LPTHREADENTRY32);
typedef BOOL (WINAPI *MODULE32)(HANDLE, LPMODULEENTRY32); typedef BOOL (WINAPI *MODULE32)(HANDLE, LPMODULEENTRY32);
#include <lmcons.h>
#include <lmstats.h>
typedef NET_API_STATUS (NET_API_FUNCTION * NETSTATGET)
(LMSTR, LMSTR, DWORD, DWORD, LPBYTE*);
typedef NET_API_STATUS (NET_API_FUNCTION * NETFREE)(LPBYTE);
int RAND_poll(void) int RAND_poll(void)
{ {
MEMORYSTATUS m; MEMORYSTATUS m;
@ -177,15 +183,71 @@ int RAND_poll(void)
DWORD w; DWORD w;
HWND h; HWND h;
HMODULE advapi, kernel, user; HMODULE advapi, kernel, user, netapi;
CRYPTACQUIRECONTEXT acquire; CRYPTACQUIRECONTEXT acquire;
CRYPTGENRANDOM gen; CRYPTGENRANDOM gen;
CRYPTRELEASECONTEXT release; CRYPTRELEASECONTEXT release;
NETSTATGET netstatget;
NETFREE netfree;
/* load functions dynamically - not available on all systems */ /* load functions dynamically - not available on all systems */
advapi = GetModuleHandle("ADVAPI32.DLL"); advapi = GetModuleHandle("ADVAPI32.DLL");
kernel = GetModuleHandle("KERNEL32.DLL"); kernel = GetModuleHandle("KERNEL32.DLL");
user = GetModuleHandle("USER32.DLL"); user = GetModuleHandle("USER32.DLL");
netapi = GetModuleHandle("NETAPI32.DLL");
if (netapi)
{
netstatget = (NETSTATGET) GetProcAddress(netapi,"NetStatisticsGet");
netfree = (NETFREE) GetProcAddress(netapi,"NetApiBufferFree");
}
if (netstatget && netfree)
{
LPBYTE outbuf;
/* NetStatisticsGet() is a Unicode only function */
if (netstatget(NULL, L"LanmanWorkstation", 0, 0, &outbuf) == 0)
{
RAND_add(outbuf, sizeof(STAT_WORKSTATION_0), 0);
netfree(outbuf);
}
if (netstatget(NULL, L"LanmanServer", 0, 0, &outbuf) == 0)
{
RAND_add(outbuf, sizeof(STAT_SERVER_0), 0);
netfree(outbuf);
}
}
/* Read Performance Statistics from NT/2000 registry */
/* The size of the performance data can vary from call to call */
/* so we must guess the size of the buffer to use and increase */
/* its size if we get an ERROR_MORE_DATA return instead of */
/* ERROR_SUCCESS. */
{
LONG rc=ERROR_MORE_DATA;
char * buf=NULL;
DWORD bufsz=0;
DWORD length;
while (rc == ERROR_MORE_DATA)
{
buf = realloc(buf,bufsz+8192);
if (!buf)
break;
bufsz += 8192;
length = bufsz;
rc = RegQueryValueEx(HKEY_PERFORMANCE_DATA, "Global",
NULL, NULL, buf, &length);
}
if (rc == ERROR_SUCCESS)
{
RAND_add(&length, sizeof(length), 0);
RAND_add(buf, length, 0);
}
if ( buf )
free(buf);
}
if (advapi) if (advapi)
{ {
@ -255,17 +317,29 @@ int RAND_poll(void)
RAND_add(&h, sizeof(h), 0); RAND_add(&h, sizeof(h), 0);
} }
#if 0 if (cursor)
{
/* unfortunately, its not safe to call GetCursorInfo()
* on NT4 even though it exists in SP3 (or SP6) and
* higher.
*/
OSVERSIONINFO osverinfo ;
osverinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO) ;
GetVersionEx( &osverinfo ) ;
if ( osverinfo.dwPlatformId == VER_PLATFORM_WIN32_NT &&
osverinfo.dwMajorVersion < 5)
cursor = 0;
}
if (cursor) if (cursor)
{ {
/* cursor position */ /* cursor position */
PCURSORINFO p = (PCURSORINFO) buf; CURSORINFO ci;
p->cbSize = sizeof(CURSORINFO); ci.cbSize = sizeof(CURSORINFO);
if (cursor(p)) if (cursor(&ci))
RAND_add(p+sizeof(p->cbSize), RAND_add(&ci, ci.cbSize, 0);
p->cbSize-sizeof(p->cbSize), 0);
} }
#endif
if (queue) if (queue)
{ {
@ -277,7 +351,7 @@ int RAND_poll(void)
/* Toolhelp32 snapshot: enumerate processes, threads, modules and heap /* Toolhelp32 snapshot: enumerate processes, threads, modules and heap
* http://msdn.microsoft.com/library/psdk/winbase/toolhelp_5pfd.htm * http://msdn.microsoft.com/library/psdk/winbase/toolhelp_5pfd.htm
* (Win 9x only, not available on NT) * (Win 9x and 2000 only, not available on NT)
* *
* This seeding method was proposed in Peter Gutmann, Software * This seeding method was proposed in Peter Gutmann, Software
* Generation of Practically Strong Random Numbers, * Generation of Practically Strong Random Numbers,