[openssl] master update

bernd.edlinger at hotmail.de bernd.edlinger at hotmail.de
Mon Sep 9 14:44:53 UTC 2019


The branch master has been updated
       via  d3a1128bc25ec8bf835c81821e1be68fba39ab4b (commit)
      from  20bf3d8b22f8c1a3529034007d3618fd1fc4fa16 (commit)


- Log -----------------------------------------------------------------
commit d3a1128bc25ec8bf835c81821e1be68fba39ab4b
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Mon Sep 9 11:42:56 2019 +0200

    Fix build with VS2008
    
    crypto/rand/rand_win.c(70) : error C2065: 'BCRYPT_USE_SYSTEM_PREFERRED_RNG' : undeclared identifier
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9827)

-----------------------------------------------------------------------

Summary of changes:
 crypto/rand/rand_win.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c
index 8b87419698..38852dc7a0 100644
--- a/crypto/rand/rand_win.c
+++ b/crypto/rand/rand_win.c
@@ -19,7 +19,8 @@
 
 # include <windows.h>
 /* On Windows Vista or higher use BCrypt instead of the legacy CryptoAPI */
-# if defined(_MSC_VER) && defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0600
+# if defined(_MSC_VER) && _MSC_VER > 1500 /* 1500 = Visual Studio 2008 */ \
+     && defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0600
 #  define USE_BCRYPTGENRANDOM
 # endif
 


More information about the openssl-commits mailing list