diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-05-15 15:56:05 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-05-19 11:02:41 +0200 |
| commit | 5a29b6286f8ccafc2ed9a026b0e8d4bd6d0396e6 (patch) | |
| tree | 7addeebb9956f0e747bb0c1175e0e79eecb7b762 /include | |
| parent | c0ec5ce0bf97c358bea29c81d3d16047244a9a7e (diff) | |
CORE: query for operations only once per provider (unless no_store is true)
When a desired algorithm wasn't available, we didn't register anywhere
that an attempt had been made, with the result that next time the same
attempt was made, the whole process would be done again.
To avoid this churn, we register a bit for each operation that has
been queried in the libcrypto provider object, and test it before
trying the same query and method construction loop again.
If course, if the provider has told us not to cache, we don't register
this bit.
Fixes #11814
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11842)
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/core.h | 4 | ||||
| -rw-r--r-- | include/internal/provider.h | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/internal/core.h b/include/internal/core.h index ca04333486..e2d2b28e8c 100644 --- a/include/internal/core.h +++ b/include/internal/core.h @@ -50,9 +50,13 @@ void *ossl_method_construct(OPENSSL_CTX *ctx, int operation_id, void ossl_algorithm_do_all(OPENSSL_CTX *libctx, int operation_id, OSSL_PROVIDER *provider, + int (*pre)(OSSL_PROVIDER *, int operation_id, + void *data, int *result), void (*fn)(OSSL_PROVIDER *provider, const OSSL_ALGORITHM *algo, int no_store, void *data), + int (*post)(OSSL_PROVIDER *, int operation_id, + int no_store, void *data, int *result), void *data); #endif diff --git a/include/internal/provider.h b/include/internal/provider.h index e39a5eae82..135b660f49 100644 --- a/include/internal/provider.h +++ b/include/internal/provider.h @@ -74,6 +74,11 @@ const OSSL_ALGORITHM *ossl_provider_query_operation(const OSSL_PROVIDER *prov, int operation_id, int *no_cache); +/* Cache of bits to see if we already queried an operation */ +int ossl_provider_set_operation_bit(OSSL_PROVIDER *provider, size_t bitnum); +int ossl_provider_test_operation_bit(OSSL_PROVIDER *provider, size_t bitnum, + int *result); + /* Configuration */ void ossl_provider_add_conf_module(void); |