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 /test/p_test.c | |
| 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 'test/p_test.c')
| -rw-r--r-- | test/p_test.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/p_test.c b/test/p_test.c index a730530463..bc354be95d 100644 --- a/test/p_test.c +++ b/test/p_test.c @@ -29,7 +29,7 @@ #include <openssl/core.h> #include <openssl/core_numbers.h> -static OSSL_core_get_param_types_fn *c_get_param_types = NULL; +static OSSL_core_gettable_params_fn *c_gettable_params = NULL; static OSSL_core_get_params_fn *c_get_params = NULL; /* Tell the core what params we provide and what type they are */ @@ -39,10 +39,10 @@ static const OSSL_PARAM p_param_types[] = { }; /* This is a trick to ensure we define the provider functions correctly */ -static OSSL_provider_get_param_types_fn p_get_param_types; +static OSSL_provider_gettable_params_fn p_gettable_params; static OSSL_provider_get_params_fn p_get_params; -static const OSSL_PARAM *p_get_param_types(void *_) +static const OSSL_PARAM *p_gettable_params(void *_) { return p_param_types; } @@ -101,7 +101,7 @@ static int p_get_params(void *vprov, OSSL_PARAM params[]) } static const OSSL_DISPATCH p_test_table[] = { - { OSSL_FUNC_PROVIDER_GET_PARAM_TYPES, (void (*)(void))p_get_param_types }, + { OSSL_FUNC_PROVIDER_GETTABLE_PARAMS, (void (*)(void))p_gettable_params }, { OSSL_FUNC_PROVIDER_GET_PARAMS, (void (*)(void))p_get_params }, { 0, NULL } }; @@ -113,8 +113,8 @@ int OSSL_provider_init(const OSSL_PROVIDER *provider, { for (; in->function_id != 0; in++) { switch (in->function_id) { - case OSSL_FUNC_CORE_GET_PARAM_TYPES: - c_get_param_types = OSSL_get_core_get_param_types(in); + case OSSL_FUNC_CORE_GETTABLE_PARAMS: + c_gettable_params = OSSL_get_core_gettable_params(in); break; case OSSL_FUNC_CORE_GET_PARAMS: c_get_params = OSSL_get_core_get_params(in); |