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 /test/tls-provider.c | |
| parent | 23c48d94d4d34eedc15fa65e0fa0e38a6137e09f (diff) | |
| download | openssl-new-363b1e5daea4a01889e6ff27148018be63d33b9b.tar.gz | |
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 'test/tls-provider.c')
| -rw-r--r-- | test/tls-provider.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/test/tls-provider.c b/test/tls-provider.c index 158c00747c..37ba1f96d3 100644 --- a/test/tls-provider.c +++ b/test/tls-provider.c @@ -86,12 +86,12 @@ static int tls_prov_get_capabilities(void *provctx, const char *capability, * together. Don't use this! */ -static OSSL_OP_keyexch_newctx_fn xor_newctx; -static OSSL_OP_keyexch_init_fn xor_init; -static OSSL_OP_keyexch_set_peer_fn xor_set_peer; -static OSSL_OP_keyexch_derive_fn xor_derive; -static OSSL_OP_keyexch_freectx_fn xor_freectx; -static OSSL_OP_keyexch_dupctx_fn xor_dupctx; +static OSSL_FUNC_keyexch_newctx_fn xor_newctx; +static OSSL_FUNC_keyexch_init_fn xor_init; +static OSSL_FUNC_keyexch_set_peer_fn xor_set_peer; +static OSSL_FUNC_keyexch_derive_fn xor_derive; +static OSSL_FUNC_keyexch_freectx_fn xor_freectx; +static OSSL_FUNC_keyexch_dupctx_fn xor_dupctx; typedef struct { XORKEY *key; @@ -186,19 +186,19 @@ static const OSSL_ALGORITHM tls_prov_keyexch[] = { /* Key Management for the dummy XOR key exchange algorithm */ -static OSSL_OP_keymgmt_new_fn xor_newdata; -static OSSL_OP_keymgmt_free_fn xor_freedata; -static OSSL_OP_keymgmt_has_fn xor_has; -static OSSL_OP_keymgmt_copy_fn xor_copy; -static OSSL_OP_keymgmt_gen_init_fn xor_gen_init; -static OSSL_OP_keymgmt_gen_set_params_fn xor_gen_set_params; -static OSSL_OP_keymgmt_gen_settable_params_fn xor_gen_settable_params; -static OSSL_OP_keymgmt_gen_fn xor_gen; -static OSSL_OP_keymgmt_gen_cleanup_fn xor_gen_cleanup; -static OSSL_OP_keymgmt_get_params_fn xor_get_params; -static OSSL_OP_keymgmt_gettable_params_fn xor_gettable_params; -static OSSL_OP_keymgmt_set_params_fn xor_set_params; -static OSSL_OP_keymgmt_settable_params_fn xor_settable_params; +static OSSL_FUNC_keymgmt_new_fn xor_newdata; +static OSSL_FUNC_keymgmt_free_fn xor_freedata; +static OSSL_FUNC_keymgmt_has_fn xor_has; +static OSSL_FUNC_keymgmt_copy_fn xor_copy; +static OSSL_FUNC_keymgmt_gen_init_fn xor_gen_init; +static OSSL_FUNC_keymgmt_gen_set_params_fn xor_gen_set_params; +static OSSL_FUNC_keymgmt_gen_settable_params_fn xor_gen_settable_params; +static OSSL_FUNC_keymgmt_gen_fn xor_gen; +static OSSL_FUNC_keymgmt_gen_cleanup_fn xor_gen_cleanup; +static OSSL_FUNC_keymgmt_get_params_fn xor_get_params; +static OSSL_FUNC_keymgmt_gettable_params_fn xor_gettable_params; +static OSSL_FUNC_keymgmt_set_params_fn xor_set_params; +static OSSL_FUNC_keymgmt_settable_params_fn xor_settable_params; static void *xor_newdata(void *provctx) { |