DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

OpenSSL: Load OpenSSL 3.0 legacy provider but let default be loaded

Browse source 
The default provider is being loaded here explicitly only because
OSSL_PROVIDER_load() disables the fallback provider loading (on either
success or failure). If the legacy provider fails to load, which it may
in some configurations, it will never load the default provider.

Just use the formulation which attempts to load without changing the
fallback behavior.

"default" will still be/only be loaded if no other provider (notably
FIPS) is loaded to provide algorithms.

Signed-off-by: Norman Hamer <nhamer@absolute.com>
This commit is contained in:
Norman Hamer 2022-10-31 23:06:22 +00:00 committed by Jouni Malinen
parent fef4c6cb0d
commit 0143dc1cb6
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/crypto/crypto_openssl.c
View file

@ -182,7 +182,6 @@ static int EC_GROUP_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a,
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
static OSSL_PROVIDER *openssl_default_provider = NULL;
static OSSL_PROVIDER *openssl_legacy_provider = NULL;
#endif /* OpenSSL version >= 3.0 */
@ -192,9 +191,7 @@ void openssl_load_legacy_provider(void)
if (openssl_legacy_provider)
return;
openssl_legacy_provider = OSSL_PROVIDER_load(NULL, "legacy");
if (openssl_legacy_provider && !openssl_default_provider)
openssl_default_provider = OSSL_PROVIDER_load(NULL, "default");
openssl_legacy_provider = OSSL_PROVIDER_try_load(NULL, "legacy", 1);
#endif /* OpenSSL version >= 3.0 */
}
@ -206,10 +203,6 @@ static void openssl_unload_legacy_provider(void)
OSSL_PROVIDER_unload(openssl_legacy_provider);
openssl_legacy_provider = NULL;
}
if (openssl_default_provider) {
OSSL_PROVIDER_unload(openssl_default_provider);
openssl_default_provider = NULL;
}
#endif /* OpenSSL version >= 3.0 */
}