diff options
author | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2020-06-21 01:19:16 +0200 |
---|---|---|
committer | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2020-06-24 22:01:22 +0200 |
commit | 363b1e5daea4a01889e6ff27148018be63d33b9b (patch) | |
tree | 9e6f5fe3be912b433fa848c44df11a15d0aa2921 /crypto/provider_core.c | |
parent | 23c48d94d4d34eedc15fa65e0fa0e38a6137e09f (diff) | |
download | openssl-363b1e5daea4a01889e6ff27148018be63d33b9b.tar.gz |
Make the naming scheme for dispatched functions more consistent
The new naming scheme consistently usese the `OSSL_FUNC_` prefix for all
functions which are dispatched between the core and providers.
This change includes in particular all up- and downcalls, i.e., the
dispatched functions passed from core to provider and vice versa.
- OSSL_core_ -> OSSL_FUNC_core_
- OSSL_provider_ -> OSSL_FUNC_core_
For operations and their function dispatch tables, the following convention
is used:
Type | Name (evp_generic_fetch(3)) |
---------------------|-----------------------------------|
operation | OSSL_OP_FOO |
function id | OSSL_FUNC_FOO_FUNCTION_NAME |
function "name" | OSSL_FUNC_foo_function_name |
function typedef | OSSL_FUNC_foo_function_name_fn |
function ptr getter | OSSL_FUNC_foo_function_name |
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12222)
Diffstat (limited to 'crypto/provider_core.c')
-rw-r--r-- | crypto/provider_core.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/crypto/provider_core.c b/crypto/provider_core.c index 20319b7417..a2350bb88e 100644 --- a/crypto/provider_core.c +++ b/crypto/provider_core.c @@ -67,11 +67,11 @@ struct ossl_provider_st { #endif /* Provider side functions */ - OSSL_provider_teardown_fn *teardown; - OSSL_provider_gettable_params_fn *gettable_params; - OSSL_provider_get_params_fn *get_params; - OSSL_provider_get_capabilities_fn *get_capabilities; - OSSL_provider_query_operation_fn *query_operation; + OSSL_FUNC_provider_teardown_fn *teardown; + OSSL_FUNC_provider_gettable_params_fn *gettable_params; + OSSL_FUNC_provider_get_params_fn *get_params; + OSSL_FUNC_provider_get_capabilities_fn *get_capabilities; + OSSL_FUNC_provider_query_operation_fn *query_operation; /* * Cache of bit to indicate of query_operation() has been called on @@ -451,7 +451,7 @@ static int provider_activate(OSSL_PROVIDER *prov) void *tmp_provctx = NULL; /* safety measure */ #ifndef OPENSSL_NO_ERR # ifndef FIPS_MODULE - OSSL_provider_get_reason_strings_fn *p_get_reason_strings = NULL; + OSSL_FUNC_provider_get_reason_strings_fn *p_get_reason_strings = NULL; # endif #endif @@ -534,29 +534,29 @@ static int provider_activate(OSSL_PROVIDER *prov) switch (provider_dispatch->function_id) { case OSSL_FUNC_PROVIDER_TEARDOWN: prov->teardown = - OSSL_get_provider_teardown(provider_dispatch); + OSSL_FUNC_provider_teardown(provider_dispatch); break; case OSSL_FUNC_PROVIDER_GETTABLE_PARAMS: prov->gettable_params = - OSSL_get_provider_gettable_params(provider_dispatch); + OSSL_FUNC_provider_gettable_params(provider_dispatch); break; case OSSL_FUNC_PROVIDER_GET_PARAMS: prov->get_params = - OSSL_get_provider_get_params(provider_dispatch); + OSSL_FUNC_provider_get_params(provider_dispatch); break; case OSSL_FUNC_PROVIDER_GET_CAPABILITIES: prov->get_capabilities = - OSSL_get_provider_get_capabilities(provider_dispatch); + OSSL_FUNC_provider_get_capabilities(provider_dispatch); break; case OSSL_FUNC_PROVIDER_QUERY_OPERATION: prov->query_operation = - OSSL_get_provider_query_operation(provider_dispatch); + OSSL_FUNC_provider_query_operation(provider_dispatch); break; #ifndef OPENSSL_NO_ERR # ifndef FIPS_MODULE case OSSL_FUNC_PROVIDER_GET_REASON_STRINGS: p_get_reason_strings = - OSSL_get_provider_get_reason_strings(provider_dispatch); + OSSL_FUNC_provider_get_reason_strings(provider_dispatch); break; # endif #endif @@ -906,17 +906,17 @@ static const OSSL_PARAM param_types[] = { * This ensures that the compiler will complain if they aren't defined * with the correct signature. */ -static OSSL_core_gettable_params_fn core_gettable_params; -static OSSL_core_get_params_fn core_get_params; -static OSSL_core_thread_start_fn core_thread_start; -static OSSL_core_get_library_context_fn core_get_libctx; +static OSSL_FUNC_core_gettable_params_fn core_gettable_params; +static OSSL_FUNC_core_get_params_fn core_get_params; +static OSSL_FUNC_core_thread_start_fn core_thread_start; +static OSSL_FUNC_core_get_library_context_fn core_get_libctx; #ifndef FIPS_MODULE -static OSSL_core_new_error_fn core_new_error; -static OSSL_core_set_error_debug_fn core_set_error_debug; -static OSSL_core_vset_error_fn core_vset_error; -static OSSL_core_set_error_mark_fn core_set_error_mark; -static OSSL_core_clear_last_error_mark_fn core_clear_last_error_mark; -static OSSL_core_pop_error_to_mark_fn core_pop_error_to_mark; +static OSSL_FUNC_core_new_error_fn core_new_error; +static OSSL_FUNC_core_set_error_debug_fn core_set_error_debug; +static OSSL_FUNC_core_vset_error_fn core_vset_error; +static OSSL_FUNC_core_set_error_mark_fn core_set_error_mark; +static OSSL_FUNC_core_clear_last_error_mark_fn core_clear_last_error_mark; +static OSSL_FUNC_core_pop_error_to_mark_fn core_pop_error_to_mark; #endif static const OSSL_PARAM *core_gettable_params(const OSSL_CORE_HANDLE *handle) |