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/mac_meth.c | |
| parent | 23c48d94d4d34eedc15fa65e0fa0e38a6137e09f (diff) | |
| download | openssl-363b1e5daea4a01889e6ff27148018be63d33b9b.zip openssl-363b1e5daea4a01889e6ff27148018be63d33b9b.tar.gz openssl-363b1e5daea4a01889e6ff27148018be63d33b9b.tar.bz2 | |
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/mac_meth.c')
| -rw-r--r-- | crypto/evp/mac_meth.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/crypto/evp/mac_meth.c b/crypto/evp/mac_meth.c index c22ebd3..d96383a 100644 --- a/crypto/evp/mac_meth.c +++ b/crypto/evp/mac_meth.c @@ -64,70 +64,70 @@ static void *evp_mac_from_dispatch(int name_id, case OSSL_FUNC_MAC_NEWCTX: if (mac->newctx != NULL) break; - mac->newctx = OSSL_get_OP_mac_newctx(fns); + mac->newctx = OSSL_FUNC_mac_newctx(fns); fnctxcnt++; break; case OSSL_FUNC_MAC_DUPCTX: if (mac->dupctx != NULL) break; - mac->dupctx = OSSL_get_OP_mac_dupctx(fns); + mac->dupctx = OSSL_FUNC_mac_dupctx(fns); break; case OSSL_FUNC_MAC_FREECTX: if (mac->freectx != NULL) break; - mac->freectx = OSSL_get_OP_mac_freectx(fns); + mac->freectx = OSSL_FUNC_mac_freectx(fns); fnctxcnt++; break; case OSSL_FUNC_MAC_INIT: if (mac->init != NULL) break; - mac->init = OSSL_get_OP_mac_init(fns); + mac->init = OSSL_FUNC_mac_init(fns); fnmaccnt++; break; case OSSL_FUNC_MAC_UPDATE: if (mac->update != NULL) break; - mac->update = OSSL_get_OP_mac_update(fns); + mac->update = OSSL_FUNC_mac_update(fns); fnmaccnt++; break; case OSSL_FUNC_MAC_FINAL: if (mac->final != NULL) break; - mac->final = OSSL_get_OP_mac_final(fns); + mac->final = OSSL_FUNC_mac_final(fns); fnmaccnt++; break; case OSSL_FUNC_MAC_GETTABLE_PARAMS: if (mac->gettable_params != NULL) break; mac->gettable_params = - OSSL_get_OP_mac_gettable_params(fns); + OSSL_FUNC_mac_gettable_params(fns); break; case OSSL_FUNC_MAC_GETTABLE_CTX_PARAMS: if (mac->gettable_ctx_params != NULL) break; mac->gettable_ctx_params = - OSSL_get_OP_mac_gettable_ctx_params(fns); + OSSL_FUNC_mac_gettable_ctx_params(fns); break; case OSSL_FUNC_MAC_SETTABLE_CTX_PARAMS: if (mac->settable_ctx_params != NULL) break; mac->settable_ctx_params = - OSSL_get_OP_mac_settable_ctx_params(fns); + OSSL_FUNC_mac_settable_ctx_params(fns); break; case OSSL_FUNC_MAC_GET_PARAMS: if (mac->get_params != NULL) break; - mac->get_params = OSSL_get_OP_mac_get_params(fns); + mac->get_params = OSSL_FUNC_mac_get_params(fns); break; case OSSL_FUNC_MAC_GET_CTX_PARAMS: if (mac->get_ctx_params != NULL) break; - mac->get_ctx_params = OSSL_get_OP_mac_get_ctx_params(fns); + mac->get_ctx_params = OSSL_FUNC_mac_get_ctx_params(fns); break; case OSSL_FUNC_MAC_SET_CTX_PARAMS: if (mac->set_ctx_params != NULL) break; - mac->set_ctx_params = OSSL_get_OP_mac_set_ctx_params(fns); + mac->set_ctx_params = OSSL_FUNC_mac_set_ctx_params(fns); break; } } |