From 34c66925aad7d10c034b0ddce99e1bfcf9a04ea8 Mon Sep 17 00:00:00 2001 From: Geoff Thorpe Date: Fri, 28 Sep 2001 02:25:14 +0000 Subject: ENGINE_register_all_complete() will register all implementations of all algorithms present in all loaded ENGINEs. The result is that if any of those ENGINEs successfully initialises, and the ENGINE_TABLE_FLAG_NOINIT flag isn't set, then they will always be used (and cached as defaults) in preference to software implementations. Ie. accidental auto-detection of acceleration hardware :-) This change stops all implementations being automatically registered in "openssl" sub-commands, so that the "setup_engine()" handler in apps.c controls which ENGINEs are registered for use. A special case has been added that will revert to this "auto-detect" logic, ie. if the "-engine" switch is used as; -engine auto --- apps/apps.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'apps/apps.h') diff --git a/apps/apps.h b/apps/apps.h index 810710909c..57ca7659ae 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -127,20 +127,18 @@ extern BIO *bio_err; # define apps_startup() \ do { _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \ ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \ - ENGINE_load_builtin_engines(); ENGINE_register_all_complete(); \ - setup_ui_method(); } while(0) + ENGINE_load_builtin_engines(); setup_ui_method(); } while(0) # else # define apps_startup() \ do { _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \ ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \ - ENGINE_load_builtin_engines(); ENGINE_register_all_complete(); \ - setup_ui_method(); } while(0) + ENGINE_load_builtin_engines(); setup_ui_method(); } while(0) # endif # else # define apps_startup() \ do { do_pipe_sig(); OpenSSL_add_all_algorithms(); \ ERR_load_crypto_strings(); ENGINE_load_builtin_engines(); \ - ENGINE_register_all_complete(); setup_ui_method(); } while(0) + setup_ui_method(); } while(0) # endif # define apps_shutdown() \ do { destroy_ui_method(); EVP_cleanup(); \ -- cgit v1.2.3