[openssl] master update

Richard Levitte levitte at openssl.org
Tue Apr 2 12:50:00 UTC 2019


The branch master has been updated
       via  705a27f7e07c006b167b59070ff635a61f8e0407 (commit)
      from  2621e6405d7f4765bc57c86ec441129e7d367f14 (commit)


- Log -----------------------------------------------------------------
commit 705a27f7e07c006b167b59070ff635a61f8e0407
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Apr 2 14:40:11 2019 +0200

    Revert "crypto/rand/rand_win.c: include "e_os.h" to get the default _WIN32_WINNT"
    
    I turns out that this made crypto/rand/rand_win.c to never build with
    BCrypt support unless the user sets _WIN32_WINNT.  That wasn't the
    intent.
    
    This reverts commit cc8926ec8fcecae89ceab91ef753de93e49568f9.
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/8641)

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

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

diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c
index d5d5518..17ab137 100644
--- a/crypto/rand/rand_win.c
+++ b/crypto/rand/rand_win.c
@@ -11,7 +11,6 @@
 #include <openssl/rand.h>
 #include "rand_lcl.h"
 #include "internal/rand_int.h"
-#include "e_os.h"                /* For a default _WIN32_WINNT */
 #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
 
 # ifndef OPENSSL_RAND_SEED_OS


More information about the openssl-commits mailing list