Commit 6732586dde for openssl.org
commit 6732586dde0eff4d3d771cf27e69a9db1434cdca
Author: Frederik Wedel-Heinen <frederik.wedel-heinen@dencrypt.dk>
Date: Sat Mar 14 06:43:34 2026 +0100
Removes unused config_inited value in init.c
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
MergeDate: Thu Mar 19 10:44:17 2026
(Merged from https://github.com/openssl/openssl/pull/30420)
diff --git a/crypto/init.c b/crypto/init.c
index 58a0d62c70..0d10f7bf02 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -178,27 +178,24 @@ DEFINE_RUN_ONCE_STATIC_ALT(ossl_init_no_add_all_digests,
}
static CRYPTO_ONCE config = CRYPTO_ONCE_STATIC_INIT;
-static int config_inited = 0;
static const OPENSSL_INIT_SETTINGS *conf_settings = NULL;
DEFINE_RUN_ONCE_STATIC(ossl_init_config)
{
int ret = ossl_config_int(NULL);
- config_inited = 1;
return ret;
}
DEFINE_RUN_ONCE_STATIC_ALT(ossl_init_config_settings, ossl_init_config)
{
int ret = ossl_config_int(conf_settings);
- config_inited = 1;
return ret;
}
DEFINE_RUN_ONCE_STATIC_ALT(ossl_init_no_config, ossl_init_config)
{
OSSL_TRACE(INIT, "ossl_no_config_int()\n");
ossl_no_config_int();
- config_inited = 1;
+
return 1;
}