summaryrefslogtreecommitdiffstats
path: root/crypto/engine
diff options
context:
space:
mode:
authorPauli <pauli@openssl.org>2023-08-02 10:44:47 +1000
committerPauli <pauli@openssl.org>2023-08-04 11:57:27 +1000
commitcb8e64131e7ce230a9268bdd7cc4664868ff0dc9 (patch)
tree089cd7a432b9a5a96022f3ca26d6899b4f834189 /crypto/engine
parent9a255aa2bda07286d5516a77b269178fc03779b4 (diff)
no_autoload: make the no-autoload-config option work again.
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/21621)
Diffstat (limited to 'crypto/engine')
-rw-r--r--crypto/engine/eng_table.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/engine/eng_table.c b/crypto/engine/eng_table.c
index a8209d9e71..d6a7452c76 100644
--- a/crypto/engine/eng_table.c
+++ b/crypto/engine/eng_table.c
@@ -201,8 +201,10 @@ ENGINE *ossl_engine_table_select(ENGINE_TABLE **table, int nid,
ENGINE_PILE tmplate, *fnd = NULL;
int initres, loop = 0;
+#ifndef OPENSSL_NO_AUTOLOAD_CONFIG
/* Load the config before trying to check if engines are available */
OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL);
+#endif
if (!(*table)) {
OSSL_TRACE3(ENGINE_TABLE,