diff options
| author | Pauli <pauli@openssl.org> | 2023-08-02 10:44:47 +1000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2023-08-04 11:57:27 +1000 |
| commit | cb8e64131e7ce230a9268bdd7cc4664868ff0dc9 (patch) | |
| tree | 089cd7a432b9a5a96022f3ca26d6899b4f834189 /crypto/objects | |
| parent | 9a255aa2bda07286d5516a77b269178fc03779b4 (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/objects')
| -rw-r--r-- | crypto/objects/obj_dat.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c index 116080438b..b55a3a5be8 100644 --- a/crypto/objects/obj_dat.c +++ b/crypto/objects/obj_dat.c @@ -73,8 +73,10 @@ DEFINE_RUN_ONCE_STATIC(obj_lock_initialise) static ossl_inline int ossl_init_added_lock(void) { +#ifndef OPENSSL_NO_AUTOLOAD_CONFIG /* Make sure we've loaded config before checking for any "added" objects */ OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CONFIG, NULL); +#endif return RUN_ONCE(&ossl_obj_lock_init, obj_lock_initialise); } |