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/kdfs/sskdf.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'providers/implementations/kdfs/sskdf.c') diff --git a/providers/implementations/kdfs/sskdf.c b/providers/implementations/kdfs/sskdf.c index 023395b14d..cf5a9e7129 100644 --- a/providers/implementations/kdfs/sskdf.c +++ b/providers/implementations/kdfs/sskdf.c @@ -70,15 +70,15 @@ typedef struct { /* KMAC uses a Customisation string of 'KDF' */ static const unsigned char kmac_custom_str[] = { 0x4B, 0x44, 0x46 }; -static OSSL_OP_kdf_newctx_fn sskdf_new; -static OSSL_OP_kdf_freectx_fn sskdf_free; -static OSSL_OP_kdf_reset_fn sskdf_reset; -static OSSL_OP_kdf_derive_fn sskdf_derive; -static OSSL_OP_kdf_derive_fn x963kdf_derive; -static OSSL_OP_kdf_settable_ctx_params_fn sskdf_settable_ctx_params; -static OSSL_OP_kdf_set_ctx_params_fn sskdf_set_ctx_params; -static OSSL_OP_kdf_gettable_ctx_params_fn sskdf_gettable_ctx_params; -static OSSL_OP_kdf_get_ctx_params_fn sskdf_get_ctx_params; +static OSSL_FUNC_kdf_newctx_fn sskdf_new; +static OSSL_FUNC_kdf_freectx_fn sskdf_free; +static OSSL_FUNC_kdf_reset_fn sskdf_reset; +static OSSL_FUNC_kdf_derive_fn sskdf_derive; +static OSSL_FUNC_kdf_derive_fn x963kdf_derive; +static OSSL_FUNC_kdf_settable_ctx_params_fn sskdf_settable_ctx_params; +static OSSL_FUNC_kdf_set_ctx_params_fn sskdf_set_ctx_params; +static OSSL_FUNC_kdf_gettable_ctx_params_fn sskdf_gettable_ctx_params; +static OSSL_FUNC_kdf_get_ctx_params_fn sskdf_get_ctx_params; /* * Refer to https://csrc.nist.gov/publications/detail/sp/800-56c/rev-1/final -- cgit v1.2.3