From e3e6a72ec800cd112e42ec654cfb9d715c544eb0 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 10 Feb 2016 23:27:28 +0100 Subject: After auto init, check that the deprecated functions exist before using The functions that have been deprecated by the auto init changes are now guarded with deprecation checks, so it's fairly easy to see if they can be used. In test/dtlsv1listentest, we simply remove all init and cleanup code, as they are call automatically when needed. Reviewed-by: Matt Caswell --- crypto/engine/eng_all.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'crypto/engine') diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c index 285ce955b1..6dceed64b5 100644 --- 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(); -- cgit v1.2.3