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 /include | |
| parent | 9f643f54236d6cf0d0d24327acd3b858883f0686 (diff) | |
| download | openssl-dca97d0062397005a33dd9fd24b1238ebe9e52e7.tar.gz | |
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 'include')
| -rw-r--r-- | include/internal/provider.h | 2 | ||||
| -rw-r--r-- | include/internal/symhacks.h | 6 | ||||
| -rw-r--r-- | include/openssl/core_numbers.h | 8 | ||||
| -rw-r--r-- | include/openssl/provider.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/include/internal/provider.h b/include/internal/provider.h index 8b21cebd2e..f88beca8c0 100644 --- a/include/internal/provider.h +++ b/include/internal/provider.h @@ -66,7 +66,7 @@ const char *ossl_provider_module_path(const OSSL_PROVIDER *prov); /* Thin wrappers around calls to the provider */ void ossl_provider_teardown(const OSSL_PROVIDER *prov); -const OSSL_PARAM *ossl_provider_get_param_types(const OSSL_PROVIDER *prov); +const OSSL_PARAM *ossl_provider_gettable_params(const OSSL_PROVIDER *prov); int ossl_provider_get_params(const OSSL_PROVIDER *prov, OSSL_PARAM params[]); const OSSL_ALGORITHM *ossl_provider_query_operation(const OSSL_PROVIDER *prov, int operation_id, diff --git a/include/internal/symhacks.h b/include/internal/symhacks.h index 6e8f78e642..6a5a1875ff 100644 --- a/include/internal/symhacks.h +++ b/include/internal/symhacks.h @@ -17,9 +17,9 @@ /* ossl_provider_available vs OSSL_PROVIDER_available */ # undef ossl_provider_available # define ossl_provider_available ossl_int_prov_available -/* ossl_provider_get_param_types vs OSSL_PROVIDER_get_param_types */ -# undef ossl_provider_get_param_types -# define ossl_provider_get_param_types ossl_int_prov_get_param_types +/* ossl_provider_gettable_params vs OSSL_PROVIDER_gettable_params */ +# undef ossl_provider_gettable_params +# define ossl_provider_gettable_params ossl_int_prov_gettable_params /* ossl_provider_get_params vs OSSL_PROVIDER_get_params */ # undef ossl_provider_get_params # define ossl_provider_get_params ossl_int_prov_get_params diff --git a/include/openssl/core_numbers.h b/include/openssl/core_numbers.h index 7a5a1cdf8e..2503119f6e 100644 --- a/include/openssl/core_numbers.h +++ b/include/openssl/core_numbers.h @@ -57,9 +57,9 @@ extern "C" { * therefore NEVER be used as a function identity. */ /* Functions provided by the Core to the provider, reserved numbers 1-1023 */ -# define OSSL_FUNC_CORE_GET_PARAM_TYPES 1 +# define OSSL_FUNC_CORE_GETTABLE_PARAMS 1 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, - core_get_param_types,(const OSSL_PROVIDER *prov)) + core_gettable_params,(const OSSL_PROVIDER *prov)) # define OSSL_FUNC_CORE_GET_PARAMS 2 OSSL_CORE_MAKE_FUNC(int,core_get_params,(const OSSL_PROVIDER *prov, OSSL_PARAM params[])) @@ -121,9 +121,9 @@ OSSL_CORE_MAKE_FUNC(void, /* Functions provided by the provider to the Core, reserved numbers 1024-1535 */ # define OSSL_FUNC_PROVIDER_TEARDOWN 1024 OSSL_CORE_MAKE_FUNC(void,provider_teardown,(void *provctx)) -# define OSSL_FUNC_PROVIDER_GET_PARAM_TYPES 1025 +# define OSSL_FUNC_PROVIDER_GETTABLE_PARAMS 1025 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, - provider_get_param_types,(void *provctx)) + provider_gettable_params,(void *provctx)) # define OSSL_FUNC_PROVIDER_GET_PARAMS 1026 OSSL_CORE_MAKE_FUNC(int,provider_get_params,(void *provctx, OSSL_PARAM params[])) diff --git a/include/openssl/provider.h b/include/openssl/provider.h index d5a62926a7..db8e714393 100644 --- a/include/openssl/provider.h +++ b/include/openssl/provider.h @@ -21,7 +21,7 @@ OSSL_PROVIDER *OSSL_PROVIDER_load(OPENSSL_CTX *, const char *name); int OSSL_PROVIDER_unload(OSSL_PROVIDER *prov); int OSSL_PROVIDER_available(OPENSSL_CTX *, const char *name); -const OSSL_PARAM *OSSL_PROVIDER_get_param_types(const OSSL_PROVIDER *prov); +const OSSL_PARAM *OSSL_PROVIDER_gettable_params(const OSSL_PROVIDER *prov); int OSSL_PROVIDER_get_params(const OSSL_PROVIDER *prov, OSSL_PARAM params[]); /* Add a built in providers */ |