After auto init, check that the deprecated functions exist before using

[oweals/openssl.git] / crypto / engine / eng_all.c

diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index 285ce955b18b146d9cb0ebb105cad4ceba133b16..6dceed64b573d67473c55f2d77a8496350d6d80f 100644 (file)
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -64,29 +64,30 @@ 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
-/*-
- * These engines have been disabled as they do not currently build
-#ifndef OPENSSL_NO_HW_NCIPHER
-        ENGINE_load_chil();
-#endif
-#ifndef OPENSSL_NO_HW_UBSEC
-        ENGINE_load_ubsec();
-#endif
-*/
 #  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();