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/ciphers/cipher_blowfish.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'providers/implementations/ciphers/cipher_blowfish.c') diff --git a/providers/implementations/ciphers/cipher_blowfish.c b/providers/implementations/ciphers/cipher_blowfish.c index 128e5d769a..bb2fa88f6a 100644 --- a/providers/implementations/ciphers/cipher_blowfish.c +++ b/providers/implementations/ciphers/cipher_blowfish.c @@ -20,8 +20,8 @@ #define BF_FLAGS (EVP_CIPH_VARIABLE_LENGTH) -static OSSL_OP_cipher_freectx_fn blowfish_freectx; -static OSSL_OP_cipher_dupctx_fn blowfish_dupctx; +static OSSL_FUNC_cipher_freectx_fn blowfish_freectx; +static OSSL_FUNC_cipher_dupctx_fn blowfish_dupctx; static void blowfish_freectx(void *vctx) { -- cgit v1.2.1