diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-08-14 20:17:39 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-08-15 11:58:25 +0200 |
| commit | dca97d0062397005a33dd9fd24b1238ebe9e52e7 (patch) | |
| tree | 7b0bcd2ea9ddcd1e5f57ceec703d19396d2f052d /crypto | |
| parent | 9f643f54236d6cf0d0d24327acd3b858883f0686 (diff) | |
Rename provider and core get_param_types functions
It was argued that names like SOMETHING_set_param_types were confusing,
and a rename has been proposed to SOMETHING_settable_params, and by
consequence, SOMETHING_get_param_types is renamed
SOMETHING_gettable_params.
This changes implements this change for the dispatched provider and
core functions.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/9591)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/provider.c | 4 | ||||
| -rw-r--r-- | crypto/provider_core.c | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/crypto/provider.c b/crypto/provider.c index 25ded2df99..fe46d31877 100644 --- a/crypto/provider.c +++ b/crypto/provider.c @@ -47,9 +47,9 @@ int OSSL_PROVIDER_available(OPENSSL_CTX *libctx, const char *name) return available; } -const OSSL_PARAM *OSSL_PROVIDER_get_param_types(const OSSL_PROVIDER *prov) +const OSSL_PARAM *OSSL_PROVIDER_gettable_params(const OSSL_PROVIDER *prov) { - return ossl_provider_get_param_types(prov); + return ossl_provider_gettable_params(prov); } int OSSL_PROVIDER_get_params(const OSSL_PROVIDER *prov, OSSL_PARAM params[]) diff --git a/crypto/provider_core.c b/crypto/provider_core.c index a821d17e46..637ecab1b6 100644 --- a/crypto/provider_core.c +++ b/crypto/provider_core.c @@ -62,7 +62,7 @@ struct ossl_provider_st { /* Provider side functions */ OSSL_provider_teardown_fn *teardown; - OSSL_provider_get_param_types_fn *get_param_types; + OSSL_provider_gettable_params_fn *gettable_params; OSSL_provider_get_params_fn *get_params; OSSL_provider_query_operation_fn *query_operation; @@ -464,9 +464,9 @@ static int provider_activate(OSSL_PROVIDER *prov) prov->teardown = OSSL_get_provider_teardown(provider_dispatch); break; - case OSSL_FUNC_PROVIDER_GET_PARAM_TYPES: - prov->get_param_types = - OSSL_get_provider_get_param_types(provider_dispatch); + case OSSL_FUNC_PROVIDER_GETTABLE_PARAMS: + prov->gettable_params = + OSSL_get_provider_gettable_params(provider_dispatch); break; case OSSL_FUNC_PROVIDER_GET_PARAMS: prov->get_params = @@ -713,10 +713,10 @@ void ossl_provider_teardown(const OSSL_PROVIDER *prov) prov->teardown(prov->provctx); } -const OSSL_PARAM *ossl_provider_get_param_types(const OSSL_PROVIDER *prov) +const OSSL_PARAM *ossl_provider_gettable_params(const OSSL_PROVIDER *prov) { - return prov->get_param_types == NULL - ? NULL : prov->get_param_types(prov->provctx); + return prov->gettable_params == NULL + ? NULL : prov->gettable_params(prov->provctx); } int ossl_provider_get_params(const OSSL_PROVIDER *prov, OSSL_PARAM params[]) @@ -756,7 +756,7 @@ 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_get_param_types_fn core_get_param_types; +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; @@ -766,7 +766,7 @@ static OSSL_core_set_error_debug_fn core_set_error_debug; static OSSL_core_vset_error_fn core_vset_error; #endif -static const OSSL_PARAM *core_get_param_types(const OSSL_PROVIDER *prov) +static const OSSL_PARAM *core_gettable_params(const OSSL_PROVIDER *prov) { return param_types; } @@ -855,7 +855,7 @@ static void core_vset_error(const OSSL_PROVIDER *prov, * functions. */ static const OSSL_DISPATCH core_dispatch_[] = { - { OSSL_FUNC_CORE_GET_PARAM_TYPES, (void (*)(void))core_get_param_types }, + { OSSL_FUNC_CORE_GETTABLE_PARAMS, (void (*)(void))core_gettable_params }, { OSSL_FUNC_CORE_GET_PARAMS, (void (*)(void))core_get_params }, { OSSL_FUNC_CORE_GET_LIBRARY_CONTEXT, (void (*)(void))core_get_libctx }, { OSSL_FUNC_CORE_THREAD_START, (void (*)(void))core_thread_start }, |