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

Use Windows randomness code on Cygwin

Browse Source
This commit is contained in:
Ulf Möller 2005-03-19 11:39:17 +00:00
parent 8d274837e5
commit 130db968b8
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -763,6 +763,9 @@
Changes between 0.9.7e and 0.9.7f [XX xxx XXXX] Changes between 0.9.7e and 0.9.7f [XX xxx XXXX]
*) Use Windows randomness collection on Cygwin.
[Ulf Möller]
*) Fix hang in EGD/PRNGD query when communication socket is closed *) Fix hang in EGD/PRNGD query when communication socket is closed
prematurely by EGD/PRNGD. prematurely by EGD/PRNGD.
[Darren Tucker <dtucker@zip.com.au> via Lutz Jänicke, resolves #1014] [Darren Tucker <dtucker@zip.com.au> via Lutz Jänicke, resolves #1014]

4
crypto/rand/rand_win.c
View File

@ -113,7 +113,7 @@
#include <openssl/rand.h> #include <openssl/rand.h>
#include "rand_lcl.h" #include "rand_lcl.h"
#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN32_CYGWIN)
#include <windows.h> #include <windows.h>
#ifndef _WIN32_WINNT #ifndef _WIN32_WINNT
# define _WIN32_WINNT 0x0400 # define _WIN32_WINNT 0x0400
@ -680,7 +680,7 @@ static void readtimer(void)
static void readscreen(void) static void readscreen(void)
{ {
#ifndef OPENSSL_SYS_WINCE #if !defined(OPENSSL_SYS_WINCE) && !defined(OPENSSL_SYS_WIN32_CYGWIN)
HDC hScrDC; /* screen DC */ HDC hScrDC; /* screen DC */
HDC hMemDC; /* memory DC */ HDC hMemDC; /* memory DC */
HBITMAP hBitmap; /* handle for our bitmap */ HBITMAP hBitmap; /* handle for our bitmap */