diff options
| author | Richard Levitte <levitte@openssl.org> | 2002-11-13 23:21:12 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2002-11-13 23:21:12 +0000 |
| commit | 2fb453829b18a43128cc7d233478f954f2257dc4 (patch) | |
| tree | a31e09a238f182ecb02333bd348f4e958d239c28 /crypto/rand | |
| parent | d671684561f8c9e7f75f3b9ec769da01723d8b2a (diff) | |
Some part of the Windows random seed code could hang on NT4.0 (SP6).
The same was recently reported for ODBC applications. Therefore,
merge in this change from 0.9.7-stable.
PR: 230
Diffstat (limited to 'crypto/rand')
| -rw-r--r-- | crypto/rand/rand_win.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c index 2b4b1446ed..dfca0e0d5d 100644 --- a/crypto/rand/rand_win.c +++ b/crypto/rand/rand_win.c @@ -254,6 +254,10 @@ int RAND_poll(void) * at random times on Windows 2000. Reported by Jeffrey Altman. * Only use it on NT. */ + /* Wolfgang Marczy <WMarczy@topcall.co.at> reports that + * the RegQueryValueEx call below can hang on NT4.0 (SP6). + * So we don't use this at all for now. */ +#if 0 if ( osverinfo.dwPlatformId == VER_PLATFORM_WIN32_NT && osverinfo.dwMajorVersion < 5) { @@ -290,6 +294,7 @@ int RAND_poll(void) if (buf) free(buf); } +#endif if (advapi) { @@ -461,7 +466,7 @@ int RAND_poll(void) hlist.th32ProcessID, hlist.th32HeapID)) { - int entrycnt = 50; + int entrycnt = 80; do RAND_add(&hentry, hentry.dwSize, 5); |