From 22e27978b29b2cdc1db79659ed653d6cf31834ab Mon Sep 17 00:00:00 2001 From: Shane Lontis Date: Fri, 20 Mar 2020 20:25:39 +1000 Subject: Add support for passing the libctx to the config loader The self tests for the fips module are triggered on startup and they need to know the core's libctx in order to function correctly. As the provider can be autoloaded via configuration it then needs to propagate the callers libctx down to the provider via the config load. Note that OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, ..) is still called, but will only load the default configuration if the OPENSSL_CONF environment variable is set. Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/11240) --- crypto/conf/conf_sap.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'crypto/conf/conf_sap.c') diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c index 2c5ee2a131..f628896222 100644 --- a/crypto/conf/conf_sap.c +++ b/crypto/conf/conf_sap.c @@ -59,12 +59,6 @@ int openssl_config_int(const OPENSSL_INIT_SETTINGS *settings) filename, appname, flags); #endif - OPENSSL_load_builtin_modules(); -#ifndef OPENSSL_NO_ENGINE - /* Need to load ENGINEs */ - ENGINE_load_builtin_engines(); -#endif - ERR_clear_error(); #ifndef OPENSSL_SYS_UEFI ret = CONF_modules_load_file(filename, appname, flags); #endif -- cgit v1.2.3