From 35d8fa563c9abc80c6e8d87396ab48dbd1a4c78d Mon Sep 17 00:00:00 2001
From: Matt Caswell <matt@openssl.org>
Date: Tue, 9 Feb 2016 13:12:34 +0000
Subject: Updates for auto init/deinit review comments

Fixes for the auto-init/deinit code based on review comments

Reviewed-by: Richard Levitte <levitte@openssl.org>
---
 crypto/conf/conf_sap.c |  3 +--
 crypto/init.c          | 11 -----------
 2 files changed, 1 insertion(+), 13 deletions(-)

(limited to 'crypto')

diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c
index bb1dcc502f..ff19167e24 100644
--- a/crypto/conf/conf_sap.c
+++ b/crypto/conf/conf_sap.c
@@ -81,8 +81,7 @@ void OPENSSL_config(const char *config_name)
         { OPENSSL_INIT_SET_CONF_FILENAME, .value.type_string = config_name },
         { OPENSSL_INIT_SET_END, .value.type_int = 0 }
     };
-    OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_LOAD_CONFIG,
-                                      (const OPENSSL_INIT_SETTINGS *)&settings);
+    OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_LOAD_CONFIG, settings);
 }
 
 void openssl_config_internal(const char *config_name)
diff --git a/crypto/init.c b/crypto/init.c
index 1bfde6973c..b9cc6a1f76 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -55,17 +55,6 @@
  *
  */
 
-#include <openssl/e_os2.h>
-
-#if defined(OPENSSL_SYS_WINDOWS) && !defined(_WIN32_WINNT)
-/*
- * We default to requiring Windows Vista, Windows Server 2008 or later. We can
- * support lower versions if _WIN32_WINNT is explicity defined to something
- * less
- */
-# define _WIN32_WINNT 0x0600
-#endif
-
 #include <internal/cryptlib_int.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
-- 
cgit v1.2.3