diff options
author | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2020-06-21 01:19:16 +0200 |
---|---|---|
committer | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2020-06-24 22:01:22 +0200 |
commit | 363b1e5daea4a01889e6ff27148018be63d33b9b (patch) | |
tree | 9e6f5fe3be912b433fa848c44df11a15d0aa2921 /crypto/evp/keymgmt_meth.c | |
parent | 23c48d94d4d34eedc15fa65e0fa0e38a6137e09f (diff) |
Make the naming scheme for dispatched functions more consistent
The new naming scheme consistently usese the `OSSL_FUNC_` prefix for all
functions which are dispatched between the core and providers.
This change includes in particular all up- and downcalls, i.e., the
dispatched functions passed from core to provider and vice versa.
- OSSL_core_ -> OSSL_FUNC_core_
- OSSL_provider_ -> OSSL_FUNC_core_
For operations and their function dispatch tables, the following convention
is used:
Type | Name (evp_generic_fetch(3)) |
---------------------|-----------------------------------|
operation | OSSL_OP_FOO |
function id | OSSL_FUNC_FOO_FUNCTION_NAME |
function "name" | OSSL_FUNC_foo_function_name |
function typedef | OSSL_FUNC_foo_function_name_fn |
function ptr getter | OSSL_FUNC_foo_function_name |
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12222)
Diffstat (limited to 'crypto/evp/keymgmt_meth.c')
-rw-r--r-- | crypto/evp/keymgmt_meth.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/crypto/evp/keymgmt_meth.c b/crypto/evp/keymgmt_meth.c index 55dcae73e3..7847b98380 100644 --- a/crypto/evp/keymgmt_meth.c +++ b/crypto/evp/keymgmt_meth.c @@ -52,112 +52,112 @@ static void *keymgmt_from_dispatch(int name_id, switch (fns->function_id) { case OSSL_FUNC_KEYMGMT_NEW: if (keymgmt->new == NULL) - keymgmt->new = OSSL_get_OP_keymgmt_new(fns); + keymgmt->new = OSSL_FUNC_keymgmt_new(fns); break; case OSSL_FUNC_KEYMGMT_GEN_INIT: if (keymgmt->gen_init == NULL) - keymgmt->gen_init = OSSL_get_OP_keymgmt_gen_init(fns); + keymgmt->gen_init = OSSL_FUNC_keymgmt_gen_init(fns); break; case OSSL_FUNC_KEYMGMT_GEN_SET_TEMPLATE: if (keymgmt->gen_set_template == NULL) keymgmt->gen_set_template = - OSSL_get_OP_keymgmt_gen_set_template(fns); + OSSL_FUNC_keymgmt_gen_set_template(fns); break; case OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS: if (keymgmt->gen_set_params == NULL) { setgenparamfncnt++; keymgmt->gen_set_params = - OSSL_get_OP_keymgmt_gen_set_params(fns); + OSSL_FUNC_keymgmt_gen_set_params(fns); } break; case OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS: if (keymgmt->gen_settable_params == NULL) { setgenparamfncnt++; keymgmt->gen_settable_params = - OSSL_get_OP_keymgmt_gen_settable_params(fns); + OSSL_FUNC_keymgmt_gen_settable_params(fns); } break; case OSSL_FUNC_KEYMGMT_GEN: if (keymgmt->gen == NULL) - keymgmt->gen = OSSL_get_OP_keymgmt_gen(fns); + keymgmt->gen = OSSL_FUNC_keymgmt_gen(fns); break; case OSSL_FUNC_KEYMGMT_GEN_CLEANUP: if (keymgmt->gen_cleanup == NULL) - keymgmt->gen_cleanup = OSSL_get_OP_keymgmt_gen_cleanup(fns); + keymgmt->gen_cleanup = OSSL_FUNC_keymgmt_gen_cleanup(fns); break; case OSSL_FUNC_KEYMGMT_FREE: if (keymgmt->free == NULL) - keymgmt->free = OSSL_get_OP_keymgmt_free(fns); + keymgmt->free = OSSL_FUNC_keymgmt_free(fns); break; case OSSL_FUNC_KEYMGMT_GET_PARAMS: if (keymgmt->get_params == NULL) { getparamfncnt++; - keymgmt->get_params = OSSL_get_OP_keymgmt_get_params(fns); + keymgmt->get_params = OSSL_FUNC_keymgmt_get_params(fns); } break; case OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS: if (keymgmt->gettable_params == NULL) { getparamfncnt++; keymgmt->gettable_params = - OSSL_get_OP_keymgmt_gettable_params(fns); + OSSL_FUNC_keymgmt_gettable_params(fns); } break; case OSSL_FUNC_KEYMGMT_SET_PARAMS: if (keymgmt->set_params == NULL) { setparamfncnt++; - keymgmt->set_params = OSSL_get_OP_keymgmt_set_params(fns); + keymgmt->set_params = OSSL_FUNC_keymgmt_set_params(fns); } break; case OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS: if (keymgmt->settable_params == NULL) { setparamfncnt++; keymgmt->settable_params = - OSSL_get_OP_keymgmt_settable_params(fns); + OSSL_FUNC_keymgmt_settable_params(fns); } break; case OSSL_FUNC_KEYMGMT_QUERY_OPERATION_NAME: if (keymgmt->query_operation_name == NULL) keymgmt->query_operation_name = - OSSL_get_OP_keymgmt_query_operation_name(fns); + OSSL_FUNC_keymgmt_query_operation_name(fns); break; case OSSL_FUNC_KEYMGMT_HAS: if (keymgmt->has == NULL) - keymgmt->has = OSSL_get_OP_keymgmt_has(fns); + keymgmt->has = OSSL_FUNC_keymgmt_has(fns); break; case OSSL_FUNC_KEYMGMT_COPY: if (keymgmt->copy == NULL) - keymgmt->copy = OSSL_get_OP_keymgmt_copy(fns); + keymgmt->copy = OSSL_FUNC_keymgmt_copy(fns); break; case OSSL_FUNC_KEYMGMT_VALIDATE: if (keymgmt->validate == NULL) - keymgmt->validate = OSSL_get_OP_keymgmt_validate(fns); + keymgmt->validate = OSSL_FUNC_keymgmt_validate(fns); break; case OSSL_FUNC_KEYMGMT_MATCH: if (keymgmt->match == NULL) - keymgmt->match = OSSL_get_OP_keymgmt_match(fns); + keymgmt->match = OSSL_FUNC_keymgmt_match(fns); break; case OSSL_FUNC_KEYMGMT_IMPORT: if (keymgmt->import == NULL) { importfncnt++; - keymgmt->import = OSSL_get_OP_keymgmt_import(fns); + keymgmt->import = OSSL_FUNC_keymgmt_import(fns); } break; case OSSL_FUNC_KEYMGMT_IMPORT_TYPES: if (keymgmt->import_types == NULL) { importfncnt++; - keymgmt->import_types = OSSL_get_OP_keymgmt_import_types(fns); + keymgmt->import_types = OSSL_FUNC_keymgmt_import_types(fns); } break; case OSSL_FUNC_KEYMGMT_EXPORT: if (keymgmt->export == NULL) { exportfncnt++; - keymgmt->export = OSSL_get_OP_keymgmt_export(fns); + keymgmt->export = OSSL_FUNC_keymgmt_export(fns); } break; case OSSL_FUNC_KEYMGMT_EXPORT_TYPES: if (keymgmt->export_types == NULL) { exportfncnt++; - keymgmt->export_types = OSSL_get_OP_keymgmt_export_types(fns); + keymgmt->export_types = OSSL_FUNC_keymgmt_export_types(fns); } break; } |