Avoid deprecation problems in Visual Studio 13

Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit 86d21d0b9577322ac5da0114c5fac16eb49b4cef)

Conflicts:
	e_os.h

diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c
index 34ffcd23f9a0979176a8293d95a64a353b040a74..c37c416b8891951b147b080658d76290b6cd5f57 100644 (file)
--- a/crypto/rand/rand_win.c
+++ b/crypto/rand/rand_win.c
@@ -196,12 +196,6 @@ int RAND_poll(void)
        DWORD w;
        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(_WIN32_WCE) && _WIN32_WCE>=300
@@ -281,56 +275,6 @@ 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)
-               {
-               /* 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)
                {
@@ -383,7 +327,7 @@ int RAND_poll(void)
         if (advapi)
                FreeLibrary(advapi);
 
-       if ((osverinfo.dwPlatformId != VER_PLATFORM_WIN32_NT ||
+       if ((!check_winnt() ||
             !OPENSSL_isservice()) &&
            (user = LoadLibrary(TEXT("USER32.DLL"))))
                {
@@ -407,8 +351,7 @@ int RAND_poll(void)
                         * on NT4 even though it exists in SP3 (or SP6) and
                         * higher.
                         */
-                       if ( osverinfo.dwPlatformId == VER_PLATFORM_WIN32_NT &&
-                               osverinfo.dwMajorVersion < 5)
+                       if (check_winnt() && !check_win_minplat(5))
                                cursor = 0;
                        }
                if (cursor)

diff --git a/e_os.h b/e_os.h
index c75858bf588a87c878f21b7fc43b47e8b15169c5..d8ac803c501b426912fcac02fc22d963a2f56379 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -360,12 +360,14 @@ static __inline unsigned int _strlen31(const char *str)
 #    define DEFAULT_HOME  "C:"
 #  endif
 
-/* Avoid Windows 8 SDK GetVersion deprecated problems */
+/* Avoid Visual Studio 13 GetVersion deprecated problems */
 #if defined(_MSC_VER) && _MSC_VER>=1800
 #  define check_winnt() (1)
+#  define check_win_minplat(x) (1)
 #else
 #  define check_winnt() (GetVersion() < 0x80000000)
-#endif 
+#  define check_win_minplat(x) (LOBYTE(LOWORD(GetVersion())) >= (x))
+#endif
 
 #else /* The non-microsoft world */