diff options
| author | Richard Levitte <levitte@openssl.org> | 2022-04-22 11:00:36 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2022-05-05 15:14:37 +0200 |
| commit | 8b76db9e2618225f78c84ed2b338cd005f6ef310 (patch) | |
| tree | 0df028ac760188300915d9c608d838c18c47ca17 /include/crypto | |
| parent | 27c4ac706a059aab81f3d1d8cc0ba0b3693bf155 (diff) | |
Don't empty the method store when flushing the query cache
When evp_method_store_flush() flushed the query cache, it also freed
all methods in the EVP method store, through an unfortunate call of
ossl_method_store_flush_cache() with an argument saying that all
methods should indeed be dropped.
To undo some of the confusion, ossl_method_store_flush_cache() is
renamed to ossl_method_store_cache_flush_all(), and limited to do
only that. Some if the items in the internal ALGORITHM structure are
also renamed and commented to clarify what they are for.
Fixes #18150
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18151)
(cherry picked from commit 60640d79ca7ea0980dc09c71fe6a297b5f8588a2)
Diffstat (limited to 'include/crypto')
| -rw-r--r-- | include/crypto/evp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/crypto/evp.h b/include/crypto/evp.h index 206ac26337..2afdd94323 100644 --- a/include/crypto/evp.h +++ b/include/crypto/evp.h @@ -893,7 +893,8 @@ int evp_pkey_ctx_get1_id_len_prov(EVP_PKEY_CTX *ctx, size_t *id_len); int evp_pkey_ctx_use_cached_data(EVP_PKEY_CTX *ctx); # endif /* !defined(FIPS_MODULE) */ -int evp_method_store_flush(OSSL_LIB_CTX *libctx); +int evp_method_store_cache_flush(OSSL_LIB_CTX *libctx); + int evp_default_properties_enable_fips_int(OSSL_LIB_CTX *libctx, int enable, int loadconfig); int evp_set_default_properties_int(OSSL_LIB_CTX *libctx, const char *propq, |