diff options
| author | Pauli <paul.dale@oracle.com> | 2020-09-25 10:19:19 +1000 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2021-02-24 21:24:36 +1000 |
| commit | b0001d0cf2539b9309712e3e04f407dcbb04352c (patch) | |
| tree | fb7e81074c5d0ca84b3ae37f47bc612eb608b26e /include | |
| parent | 8b3facd7324b6c2f36f6414c0552da26378aae4a (diff) | |
provider: add an unquery function to allow providers to clean up.
Without this, a provider has no way to know that an application
has finished with the array it returned earlier. A non-caching provider
requires this information.
Fixes #12974
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12974)
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/provider.h | 3 | ||||
| -rw-r--r-- | include/openssl/core_dispatch.h | 9 | ||||
| -rw-r--r-- | include/openssl/provider.h | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/include/internal/provider.h b/include/internal/provider.h index fbe3154b53..7441bf26f0 100644 --- a/include/internal/provider.h +++ b/include/internal/provider.h @@ -83,6 +83,9 @@ int ossl_provider_self_test(const OSSL_PROVIDER *prov); const OSSL_ALGORITHM *ossl_provider_query_operation(const OSSL_PROVIDER *prov, int operation_id, int *no_cache); +void ossl_provider_unquery_operation(const OSSL_PROVIDER *prov, + int operation_id, + const OSSL_ALGORITHM *algs); /* Cache of bits to see if we already queried an operation */ int ossl_provider_set_operation_bit(OSSL_PROVIDER *provider, size_t bitnum); diff --git a/include/openssl/core_dispatch.h b/include/openssl/core_dispatch.h index 6f12d6fecf..4d1d89ca82 100644 --- a/include/openssl/core_dispatch.h +++ b/include/openssl/core_dispatch.h @@ -193,13 +193,16 @@ OSSL_CORE_MAKE_FUNC(int,provider_get_params,(void *provctx, # define OSSL_FUNC_PROVIDER_QUERY_OPERATION 1027 OSSL_CORE_MAKE_FUNC(const OSSL_ALGORITHM *,provider_query_operation, (void *provctx, int operation_id, int *no_store)) -# define OSSL_FUNC_PROVIDER_GET_REASON_STRINGS 1028 +# define OSSL_FUNC_PROVIDER_UNQUERY_OPERATION 1028 +OSSL_CORE_MAKE_FUNC(void, provider_unquery_operation, + (void *provctx, int operation_id, const OSSL_ALGORITHM *)) +# define OSSL_FUNC_PROVIDER_GET_REASON_STRINGS 1029 OSSL_CORE_MAKE_FUNC(const OSSL_ITEM *,provider_get_reason_strings, (void *provctx)) -# define OSSL_FUNC_PROVIDER_GET_CAPABILITIES 1029 +# define OSSL_FUNC_PROVIDER_GET_CAPABILITIES 1030 OSSL_CORE_MAKE_FUNC(int, provider_get_capabilities, (void *provctx, const char *capability, OSSL_CALLBACK *cb, void *arg)) -# define OSSL_FUNC_PROVIDER_SELF_TEST 1030 +# define OSSL_FUNC_PROVIDER_SELF_TEST 1031 OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx)) /* Operations */ diff --git a/include/openssl/provider.h b/include/openssl/provider.h index a8720aaa7e..56b430710f 100644 --- a/include/openssl/provider.h +++ b/include/openssl/provider.h @@ -41,6 +41,8 @@ int OSSL_PROVIDER_get_capabilities(const OSSL_PROVIDER *prov, const OSSL_ALGORITHM *OSSL_PROVIDER_query_operation(const OSSL_PROVIDER *prov, int operation_id, int *no_cache); +void OSSL_PROVIDER_unquery_operation(const OSSL_PROVIDER *prov, + int operation_id, const OSSL_ALGORITHM *algs); void *OSSL_PROVIDER_get0_provider_ctx(const OSSL_PROVIDER *prov); /* Add a built in providers */ |