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

Avoid deprecation problems in Visual Studio 13

Browse Source 
Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit 86d21d0b9577322ac5da0114c5fac16eb49b4cef)
This commit is contained in:
Matt Caswell 2015-01-09 14:06:36 +00:00
parent b960060a0d
commit 23df532ec4
2 changed files with 5 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
crypto/rand/rand_win.c
View File

@ -196,12 +196,6 @@ int RAND_poll(void)
DWORD w; DWORD w;
int good = 0; int good = 0;
/* Determine the OS version we are on so we can turn off things
* that do not work properly.
*/
OSVERSIONINFO osverinfo ;
osverinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO) ;
GetVersionEx( &osverinfo ) ;
#if defined(OPENSSL_SYS_WINCE) #if defined(OPENSSL_SYS_WINCE)
# if defined(_WIN32_WCE) && _WIN32_WCE>=300 # if defined(_WIN32_WCE) && _WIN32_WCE>=300
@ -281,56 +275,6 @@ int RAND_poll(void)
* at random times on Windows 2000. Reported by Jeffrey Altman. * at random times on Windows 2000. Reported by Jeffrey Altman.
* Only use it on NT. * 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)
{
/* 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, TEXT("Global"),
NULL, NULL, buf, &length);
}
if (rc == ERROR_SUCCESS)
{
/* For entropy count assume only least significant
* byte of each DWORD is random.
*/
RAND_add(&length, sizeof(length), 0);
RAND_add(buf, length, length / 4.0);
/* Close the Registry Key to allow Windows to cleanup/close
* the open handle
* Note: The 'HKEY_PERFORMANCE_DATA' key is implicitly opened
* when the RegQueryValueEx above is done. However, if
* it is not explicitly closed, it can cause disk
* partition manipulation problems.
*/
RegCloseKey(HKEY_PERFORMANCE_DATA);
}
if (buf)
free(buf);
}
#endif
if (advapi) if (advapi)
{ {
@ -383,7 +327,7 @@ int RAND_poll(void)
if (advapi) if (advapi)
FreeLibrary(advapi); FreeLibrary(advapi);
if ((osverinfo.dwPlatformId != VER_PLATFORM_WIN32_NT || if ((!check_winnt() ||
!OPENSSL_isservice()) && !OPENSSL_isservice()) &&
(user = LoadLibrary(TEXT("USER32.DLL")))) (user = LoadLibrary(TEXT("USER32.DLL"))))
{ {
@ -407,8 +351,7 @@ int RAND_poll(void)
* on NT4 even though it exists in SP3 (or SP6) and * on NT4 even though it exists in SP3 (or SP6) and
* higher. * higher.
*/ */
if ( osverinfo.dwPlatformId == VER_PLATFORM_WIN32_NT && if (check_winnt() && !check_win_minplat(5))
osverinfo.dwMajorVersion < 5)
cursor = 0; cursor = 0;
} }
if (cursor) if (cursor)

4
e_os.h
View File

@ -371,11 +371,13 @@ static __inline unsigned int _strlen31(const char *str)
# define DEFAULT_HOME "C:" # define DEFAULT_HOME "C:"
# endif # endif
/* Avoid Windows 8 SDK GetVersion deprecated problems */ /* Avoid Visual Studio 13 GetVersion deprecated problems */
#if defined(_MSC_VER) && _MSC_VER>=1800 #if defined(_MSC_VER) && _MSC_VER>=1800
# define check_winnt() (1) # define check_winnt() (1)
# define check_win_minplat(x) (1)
#else #else
# define check_winnt() (GetVersion() < 0x80000000) # define check_winnt() (GetVersion() < 0x80000000)
# define check_win_minplat(x) (LOBYTE(LOWORD(GetVersion())) >= (x))
#endif #endif
#else /* The non-microsoft world */ #else /* The non-microsoft world */