From 363b1e5daea4a01889e6ff27148018be63d33b9b Mon Sep 17 00:00:00 2001 From: "Dr. Matthias St. Pierre" Date: Sun, 21 Jun 2020 01:19:16 +0200 Subject: 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 (Merged from https://github.com/openssl/openssl/pull/12222) --- providers/implementations/macs/kmac_prov.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'providers/implementations/macs/kmac_prov.c') diff --git a/providers/implementations/macs/kmac_prov.c b/providers/implementations/macs/kmac_prov.c index d1ccda9b23..bc37ad34cb 100644 --- a/providers/implementations/macs/kmac_prov.c +++ b/providers/implementations/macs/kmac_prov.c @@ -64,18 +64,18 @@ * necessary for the compiler, but provides an assurance that the signatures * of the functions in the dispatch table are correct. */ -static OSSL_OP_mac_newctx_fn kmac128_new; -static OSSL_OP_mac_newctx_fn kmac256_new; -static OSSL_OP_mac_dupctx_fn kmac_dup; -static OSSL_OP_mac_freectx_fn kmac_free; -static OSSL_OP_mac_gettable_ctx_params_fn kmac_gettable_ctx_params; -static OSSL_OP_mac_get_ctx_params_fn kmac_get_ctx_params; -static OSSL_OP_mac_settable_ctx_params_fn kmac_settable_ctx_params; -static OSSL_OP_mac_set_ctx_params_fn kmac_set_ctx_params; -static OSSL_OP_mac_size_fn kmac_size; -static OSSL_OP_mac_init_fn kmac_init; -static OSSL_OP_mac_update_fn kmac_update; -static OSSL_OP_mac_final_fn kmac_final; +static OSSL_FUNC_mac_newctx_fn kmac128_new; +static OSSL_FUNC_mac_newctx_fn kmac256_new; +static OSSL_FUNC_mac_dupctx_fn kmac_dup; +static OSSL_FUNC_mac_freectx_fn kmac_free; +static OSSL_FUNC_mac_gettable_ctx_params_fn kmac_gettable_ctx_params; +static OSSL_FUNC_mac_get_ctx_params_fn kmac_get_ctx_params; +static OSSL_FUNC_mac_settable_ctx_params_fn kmac_settable_ctx_params; +static OSSL_FUNC_mac_set_ctx_params_fn kmac_set_ctx_params; +static OSSL_FUNC_mac_size_fn kmac_size; +static OSSL_FUNC_mac_init_fn kmac_init; +static OSSL_FUNC_mac_update_fn kmac_update; +static OSSL_FUNC_mac_final_fn kmac_final; #define KMAC_MAX_BLOCKSIZE ((1600 - 128*2) / 8) /* 168 */ #define KMAC_MIN_BLOCKSIZE ((1600 - 256*2) / 8) /* 136 */ -- cgit v1.2.3