[openssl-commits] [openssl] master update

[Viktor Dukhovni]

The branch master has been updated
       via  31305cdf9f5648a18c5a12854b08df7c9e4069fc (commit)
      from  6762a14779e262d181fd9e076919253201eec09e (commit)


- Log -----------------------------------------------------------------
commit 31305cdf9f5648a18c5a12854b08df7c9e4069fc
Author: Viktor Dukhovni <openssl-users at dukhovni.org>
Date:   Sun Feb 14 15:25:54 2016 -0500

    Fixes to make no-deprecated work again
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/conf/conf_sap.c  |  2 ++
 crypto/engine/eng_all.c | 32 +++-----------------------------
 crypto/init.c           |  1 +
 3 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c
index 45c08e6..2021a02 100644
--- a/crypto/conf/conf_sap.c
+++ b/crypto/conf/conf_sap.c
@@ -75,6 +75,7 @@
 
 static int openssl_configured = 0;
 
+#if OPENSSL_API_COMPAT < 0x10100000L
 void OPENSSL_config(const char *config_name)
 {
     OPENSSL_INIT_SETTINGS settings;
@@ -83,6 +84,7 @@ void OPENSSL_config(const char *config_name)
     settings.config_name = strdup(config_name);
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, &settings);
 }
+#endif
 
 void openssl_config_internal(const char *config_name)
 {
diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index 6dceed6..6df6ef1 100644
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -63,34 +63,8 @@ void ENGINE_load_builtin_engines(void)
 {
     /* Some ENGINEs need this */
     OPENSSL_cpuid_setup();
-#if !defined(OPENSSL_NO_HW) && (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV))
-# ifdef ENGINE_load_cryptodev
-    ENGINE_load_cryptodev();
-# endif
-#endif
-#ifndef OPENSSL_NO_RDRAND
-# ifdef ENGINE_load_rdrand
-    ENGINE_load_rdrand();
-# endif
-#endif
-# ifdef ENGINE_load_dynamic
-    ENGINE_load_dynamic();
-# endif
-#ifndef OPENSSL_NO_STATIC_ENGINE
-# ifndef OPENSSL_NO_HW
-#  ifndef OPENSSL_NO_HW_PADLOCK
-#   ifdef ENGINE_load_padlock
-    ENGINE_load_padlock();
-#   endif
-#  endif
-# endif
-# if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
-#  ifdef ENGINE_load_capi
-    ENGINE_load_capi();
-#  endif
-# endif
-#endif
-    ENGINE_register_all_complete();
+
+    OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_ALL_BUILTIN, NULL);
 }
 
 #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
@@ -98,7 +72,7 @@ void ENGINE_setup_bsd_cryptodev(void)
 {
     static int bsd_cryptodev_default_loaded = 0;
     if (!bsd_cryptodev_default_loaded) {
-        ENGINE_load_cryptodev();
+        OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_CRYPTODEV, NULL);
         ENGINE_register_all_complete();
     }
     bsd_cryptodev_default_loaded = 1;
diff --git a/crypto/init.c b/crypto/init.c
index e58b119..25e3dc7 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -57,6 +57,7 @@
 
 #include <internal/cryptlib_int.h>
 #include <openssl/err.h>
+#include <openssl/rand.h>
 #include <openssl/evp.h>
 #include <internal/evp_int.h>
 #include <internal/conf.h>