diff options
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) |