diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-09-14 09:34:32 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-09-15 14:07:55 +0200 |
| commit | e59bfbaa2dbd680f77e1121e382502bd522a466c (patch) | |
| tree | bde78a655045e738f662072709225f15f52d4834 /providers/common | |
| parent | 1ed3249f253e4490a813279e2eb253c8e5cfaabb (diff) | |
providers: Do not use global EVP_CIPHERs and EVP_MDs
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16600)
Diffstat (limited to 'providers/common')
| -rw-r--r-- | providers/common/provider_util.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/providers/common/provider_util.c b/providers/common/provider_util.c index 662175c2f3..fcfbab632d 100644 --- a/providers/common/provider_util.c +++ b/providers/common/provider_util.c @@ -16,6 +16,7 @@ #include <openssl/proverr.h> #ifndef FIPS_MODULE # include <openssl/engine.h> +# include "crypto/evp.h" #endif #include "prov/provider_util.h" #include "internal/nelem.h" @@ -90,8 +91,14 @@ int ossl_prov_cipher_load_from_params(PROV_CIPHER *pc, ERR_set_mark(); pc->cipher = pc->alloc_cipher = EVP_CIPHER_fetch(ctx, p->data, propquery); #ifndef FIPS_MODULE /* Inside the FIPS module, we don't support legacy ciphers */ - if (pc->cipher == NULL) - pc->cipher = EVP_get_cipherbyname(p->data); + if (pc->cipher == NULL) { + const EVP_CIPHER *cipher; + + cipher = EVP_get_cipherbyname(p->data); + /* Do not use global EVP_CIPHERs */ + if (cipher != NULL && cipher->origin != EVP_ORIG_GLOBAL) + pc->cipher = cipher; + } #endif if (pc->cipher != NULL) ERR_pop_to_mark(); @@ -159,8 +166,14 @@ int ossl_prov_digest_load_from_params(PROV_DIGEST *pd, ERR_set_mark(); ossl_prov_digest_fetch(pd, ctx, p->data, propquery); #ifndef FIPS_MODULE /* Inside the FIPS module, we don't support legacy digests */ - if (pd->md == NULL) - pd->md = EVP_get_digestbyname(p->data); + if (pd->md == NULL) { + const EVP_MD *md; + + md = EVP_get_digestbyname(p->data); + /* Do not use global EVP_MDs */ + if (md != NULL && md->origin != EVP_ORIG_GLOBAL) + pd->md = md; + } #endif if (pd->md != NULL) ERR_pop_to_mark(); |