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/exchange.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/exchange.c')
-rw-r--r-- | crypto/evp/exchange.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/crypto/evp/exchange.c b/crypto/evp/exchange.c index 514ecd4039..28e1f88db9 100644 --- a/crypto/evp/exchange.c +++ b/crypto/evp/exchange.c @@ -57,61 +57,61 @@ static void *evp_keyexch_from_dispatch(int name_id, case OSSL_FUNC_KEYEXCH_NEWCTX: if (exchange->newctx != NULL) break; - exchange->newctx = OSSL_get_OP_keyexch_newctx(fns); + exchange->newctx = OSSL_FUNC_keyexch_newctx(fns); fncnt++; break; case OSSL_FUNC_KEYEXCH_INIT: if (exchange->init != NULL) break; - exchange->init = OSSL_get_OP_keyexch_init(fns); + exchange->init = OSSL_FUNC_keyexch_init(fns); fncnt++; break; case OSSL_FUNC_KEYEXCH_SET_PEER: if (exchange->set_peer != NULL) break; - exchange->set_peer = OSSL_get_OP_keyexch_set_peer(fns); + exchange->set_peer = OSSL_FUNC_keyexch_set_peer(fns); break; case OSSL_FUNC_KEYEXCH_DERIVE: if (exchange->derive != NULL) break; - exchange->derive = OSSL_get_OP_keyexch_derive(fns); + exchange->derive = OSSL_FUNC_keyexch_derive(fns); fncnt++; break; case OSSL_FUNC_KEYEXCH_FREECTX: if (exchange->freectx != NULL) break; - exchange->freectx = OSSL_get_OP_keyexch_freectx(fns); + exchange->freectx = OSSL_FUNC_keyexch_freectx(fns); fncnt++; break; case OSSL_FUNC_KEYEXCH_DUPCTX: if (exchange->dupctx != NULL) break; - exchange->dupctx = OSSL_get_OP_keyexch_dupctx(fns); + exchange->dupctx = OSSL_FUNC_keyexch_dupctx(fns); break; case OSSL_FUNC_KEYEXCH_GET_CTX_PARAMS: if (exchange->get_ctx_params != NULL) break; - exchange->get_ctx_params = OSSL_get_OP_keyexch_get_ctx_params(fns); + exchange->get_ctx_params = OSSL_FUNC_keyexch_get_ctx_params(fns); gparamfncnt++; break; case OSSL_FUNC_KEYEXCH_GETTABLE_CTX_PARAMS: if (exchange->gettable_ctx_params != NULL) break; exchange->gettable_ctx_params - = OSSL_get_OP_keyexch_gettable_ctx_params(fns); + = OSSL_FUNC_keyexch_gettable_ctx_params(fns); gparamfncnt++; break; case OSSL_FUNC_KEYEXCH_SET_CTX_PARAMS: if (exchange->set_ctx_params != NULL) break; - exchange->set_ctx_params = OSSL_get_OP_keyexch_set_ctx_params(fns); + exchange->set_ctx_params = OSSL_FUNC_keyexch_set_ctx_params(fns); sparamfncnt++; break; case OSSL_FUNC_KEYEXCH_SETTABLE_CTX_PARAMS: if (exchange->settable_ctx_params != NULL) break; exchange->settable_ctx_params - = OSSL_get_OP_keyexch_settable_ctx_params(fns); + = OSSL_FUNC_keyexch_settable_ctx_params(fns); sparamfncnt++; break; } |