diff options
| author | Pauli <pauli@openssl.org> | 2022-02-25 13:37:08 +1100 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2022-02-28 16:20:33 +1100 |
| commit | af788ad6c3624ccc4b49778a9ded2487b9dbeedd (patch) | |
| tree | b1ddb71a3efc8b6683affdb308b325c5b77b36a1 /crypto/store | |
| parent | 98b7b74122e66f63c4ec67a74e345c64a55c68db (diff) | |
| download | openssl-new-af788ad6c3624ccc4b49778a9ded2487b9dbeedd.tar.gz | |
fetch: convert a NULL property query to ""
Previously, a NULL property query was never cached and this lead to a
performance degregation. Now, such a query is converted to an empty string
and cached.
Fixes #17752
Fixes https://github.openssl.org/openssl/openssl/issues/26
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17769)
Diffstat (limited to 'crypto/store')
| -rw-r--r-- | crypto/store/store_meth.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/store/store_meth.c b/crypto/store/store_meth.c index 10b56bc685..4d18645b21 100644 --- a/crypto/store/store_meth.c +++ b/crypto/store/store_meth.c @@ -280,6 +280,7 @@ inner_loader_fetch(struct loader_data_st *methdata, int id, { OSSL_METHOD_STORE *store = get_loader_store(methdata->libctx); OSSL_NAMEMAP *namemap = ossl_namemap_stored(methdata->libctx); + const char *const propq = properties != NULL ? properties : ""; void *method = NULL; int unsupported = 0; @@ -309,7 +310,7 @@ inner_loader_fetch(struct loader_data_st *methdata, int id, unsupported = 1; if (id == 0 - || !ossl_method_store_cache_get(store, NULL, id, properties, &method)) { + || !ossl_method_store_cache_get(store, NULL, id, propq, &method)) { OSSL_METHOD_CONSTRUCT_METHOD mcm = { get_tmp_loader_store, get_loader_from_store, @@ -321,7 +322,7 @@ inner_loader_fetch(struct loader_data_st *methdata, int id, methdata->scheme_id = id; methdata->scheme = scheme; - methdata->propquery = properties; + methdata->propquery = propq; methdata->flag_construct_error_occurred = 0; if ((method = ossl_method_construct(methdata->libctx, OSSL_OP_STORE, &prov, 0 /* !force_cache */, @@ -333,7 +334,7 @@ inner_loader_fetch(struct loader_data_st *methdata, int id, */ if (id == 0) id = ossl_namemap_name2num(namemap, scheme); - ossl_method_store_cache_set(store, prov, id, properties, method, + ossl_method_store_cache_set(store, prov, id, propq, method, up_ref_loader, free_loader); } |