diff options
| author | Pauli <pauli@openssl.org> | 2023-08-02 10:44:47 +1000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2023-08-04 11:59:59 +1000 |
| commit | 386c4ed9278bf6a70a38ad49ca37af301ef9c0d5 (patch) | |
| tree | d1514de18bdb6add3a879e72ea4e7ffb5ae6653c /crypto/engine | |
| parent | e0d12217fe5260fb54e24c02a15cdae1fe3cdf70 (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)
(cherry picked from commit cb8e64131e7ce230a9268bdd7cc4664868ff0dc9)
Diffstat (limited to 'crypto/engine')
| -rw-r--r-- | crypto/engine/eng_table.c | 2 |
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, |