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 /providers/default/defltprov.c | |
| parent | crypto/engine/eng_openssl.c: define TEST_ENG_OPENSSL_RC4_P_INIT conditionally (diff) | |
| download | openssl-dca97d0062397005a33dd9fd24b1238ebe9e52e7.tar.xz openssl-dca97d0062397005a33dd9fd24b1238ebe9e52e7.zip | |
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 'providers/default/defltprov.c')
| -rw-r--r-- | providers/default/defltprov.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/providers/default/defltprov.c b/providers/default/defltprov.c index 6e4c94c61c..2a0893e038 100644 --- a/providers/default/defltprov.c +++ b/providers/default/defltprov.c @@ -16,7 +16,7 @@ #include "internal/provider_algs.h" /* Functions provided by the core */ -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; /* Parameters we provide to the core */ @@ -27,7 +27,7 @@ static const OSSL_PARAM deflt_param_types[] = { OSSL_PARAM_END }; -static const OSSL_PARAM *deflt_get_param_types(const OSSL_PROVIDER *prov) +static const OSSL_PARAM *deflt_gettable_params(const OSSL_PROVIDER *prov) { return deflt_param_types; } @@ -156,7 +156,7 @@ static const OSSL_ALGORITHM *deflt_query(OSSL_PROVIDER *prov, /* Functions we provide to the core */ static const OSSL_DISPATCH deflt_dispatch_table[] = { - { OSSL_FUNC_PROVIDER_GET_PARAM_TYPES, (void (*)(void))deflt_get_param_types }, + { OSSL_FUNC_PROVIDER_GETTABLE_PARAMS, (void (*)(void))deflt_gettable_params }, { OSSL_FUNC_PROVIDER_GET_PARAMS, (void (*)(void))deflt_get_params }, { OSSL_FUNC_PROVIDER_QUERY_OPERATION, (void (*)(void))deflt_query }, { 0, NULL } @@ -173,8 +173,8 @@ int ossl_default_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); |