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 /providers/implementations/macs | |
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 'providers/implementations/macs')
-rw-r--r-- | providers/implementations/macs/blake2_mac_impl.c | 20 | ||||
-rw-r--r-- | providers/implementations/macs/cmac_prov.c | 20 | ||||
-rw-r--r-- | providers/implementations/macs/gmac_prov.c | 20 | ||||
-rw-r--r-- | providers/implementations/macs/hmac_prov.c | 20 | ||||
-rw-r--r-- | providers/implementations/macs/kmac_prov.c | 24 | ||||
-rw-r--r-- | providers/implementations/macs/poly1305_prov.c | 20 | ||||
-rw-r--r-- | providers/implementations/macs/siphash_prov.c | 22 |
7 files changed, 73 insertions, 73 deletions
diff --git a/providers/implementations/macs/blake2_mac_impl.c b/providers/implementations/macs/blake2_mac_impl.c index 64d997bd50..bae00feada 100644 --- a/providers/implementations/macs/blake2_mac_impl.c +++ b/providers/implementations/macs/blake2_mac_impl.c @@ -21,16 +21,16 @@ * 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 blake2_mac_new; -static OSSL_OP_mac_dupctx_fn blake2_mac_dup; -static OSSL_OP_mac_freectx_fn blake2_mac_free; -static OSSL_OP_mac_gettable_ctx_params_fn blake2_gettable_ctx_params; -static OSSL_OP_mac_get_ctx_params_fn blake2_get_ctx_params; -static OSSL_OP_mac_settable_ctx_params_fn blake2_mac_settable_ctx_params; -static OSSL_OP_mac_set_ctx_params_fn blake2_mac_set_ctx_params; -static OSSL_OP_mac_init_fn blake2_mac_init; -static OSSL_OP_mac_update_fn blake2_mac_update; -static OSSL_OP_mac_final_fn blake2_mac_final; +static OSSL_FUNC_mac_newctx_fn blake2_mac_new; +static OSSL_FUNC_mac_dupctx_fn blake2_mac_dup; +static OSSL_FUNC_mac_freectx_fn blake2_mac_free; +static OSSL_FUNC_mac_gettable_ctx_params_fn blake2_gettable_ctx_params; +static OSSL_FUNC_mac_get_ctx_params_fn blake2_get_ctx_params; +static OSSL_FUNC_mac_settable_ctx_params_fn blake2_mac_settable_ctx_params; +static OSSL_FUNC_mac_set_ctx_params_fn blake2_mac_set_ctx_params; +static OSSL_FUNC_mac_init_fn blake2_mac_init; +static OSSL_FUNC_mac_update_fn blake2_mac_update; +static OSSL_FUNC_mac_final_fn blake2_mac_final; struct blake2_mac_data_st { BLAKE2_CTX ctx; diff --git a/providers/implementations/macs/cmac_prov.c b/providers/implementations/macs/cmac_prov.c index 748824782f..8ae6a89ad6 100644 --- a/providers/implementations/macs/cmac_prov.c +++ b/providers/implementations/macs/cmac_prov.c @@ -29,16 +29,16 @@ * 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 cmac_new; -static OSSL_OP_mac_dupctx_fn cmac_dup; -static OSSL_OP_mac_freectx_fn cmac_free; -static OSSL_OP_mac_gettable_ctx_params_fn cmac_gettable_ctx_params; -static OSSL_OP_mac_get_ctx_params_fn cmac_get_ctx_params; -static OSSL_OP_mac_settable_ctx_params_fn cmac_settable_ctx_params; -static OSSL_OP_mac_set_ctx_params_fn cmac_set_ctx_params; -static OSSL_OP_mac_init_fn cmac_init; -static OSSL_OP_mac_update_fn cmac_update; -static OSSL_OP_mac_final_fn cmac_final; +static OSSL_FUNC_mac_newctx_fn cmac_new; +static OSSL_FUNC_mac_dupctx_fn cmac_dup; +static OSSL_FUNC_mac_freectx_fn cmac_free; +static OSSL_FUNC_mac_gettable_ctx_params_fn cmac_gettable_ctx_params; +static OSSL_FUNC_mac_get_ctx_params_fn cmac_get_ctx_params; +static OSSL_FUNC_mac_settable_ctx_params_fn cmac_settable_ctx_params; +static OSSL_FUNC_mac_set_ctx_params_fn cmac_set_ctx_params; +static OSSL_FUNC_mac_init_fn cmac_init; +static OSSL_FUNC_mac_update_fn cmac_update; +static OSSL_FUNC_mac_final_fn cmac_final; /* local CMAC data */ diff --git a/providers/implementations/macs/gmac_prov.c b/providers/implementations/macs/gmac_prov.c index 5a0174573d..ce2173ea8b 100644 --- a/providers/implementations/macs/gmac_prov.c +++ b/providers/implementations/macs/gmac_prov.c @@ -25,16 +25,16 @@ * 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 gmac_new; -static OSSL_OP_mac_dupctx_fn gmac_dup; -static OSSL_OP_mac_freectx_fn gmac_free; -static OSSL_OP_mac_gettable_params_fn gmac_gettable_params; -static OSSL_OP_mac_get_params_fn gmac_get_params; -static OSSL_OP_mac_settable_ctx_params_fn gmac_settable_ctx_params; -static OSSL_OP_mac_set_ctx_params_fn gmac_set_ctx_params; -static OSSL_OP_mac_init_fn gmac_init; -static OSSL_OP_mac_update_fn gmac_update; -static OSSL_OP_mac_final_fn gmac_final; +static OSSL_FUNC_mac_newctx_fn gmac_new; +static OSSL_FUNC_mac_dupctx_fn gmac_dup; +static OSSL_FUNC_mac_freectx_fn gmac_free; +static OSSL_FUNC_mac_gettable_params_fn gmac_gettable_params; +static OSSL_FUNC_mac_get_params_fn gmac_get_params; +static OSSL_FUNC_mac_settable_ctx_params_fn gmac_settable_ctx_params; +static OSSL_FUNC_mac_set_ctx_params_fn gmac_set_ctx_params; +static OSSL_FUNC_mac_init_fn gmac_init; +static OSSL_FUNC_mac_update_fn gmac_update; +static OSSL_FUNC_mac_final_fn gmac_final; /* local GMAC pkey structure */ diff --git a/providers/implementations/macs/hmac_prov.c b/providers/implementations/macs/hmac_prov.c index 6974db2944..5260995861 100644 --- a/providers/implementations/macs/hmac_prov.c +++ b/providers/implementations/macs/hmac_prov.c @@ -29,16 +29,16 @@ * 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 hmac_new; -static OSSL_OP_mac_dupctx_fn hmac_dup; -static OSSL_OP_mac_freectx_fn hmac_free; -static OSSL_OP_mac_gettable_ctx_params_fn hmac_gettable_ctx_params; -static OSSL_OP_mac_get_ctx_params_fn hmac_get_ctx_params; -static OSSL_OP_mac_settable_ctx_params_fn hmac_settable_ctx_params; -static OSSL_OP_mac_set_ctx_params_fn hmac_set_ctx_params; -static OSSL_OP_mac_init_fn hmac_init; -static OSSL_OP_mac_update_fn hmac_update; -static OSSL_OP_mac_final_fn hmac_final; +static OSSL_FUNC_mac_newctx_fn hmac_new; +static OSSL_FUNC_mac_dupctx_fn hmac_dup; +static OSSL_FUNC_mac_freectx_fn hmac_free; +static OSSL_FUNC_mac_gettable_ctx_params_fn hmac_gettable_ctx_params; +static OSSL_FUNC_mac_get_ctx_params_fn hmac_get_ctx_params; +static OSSL_FUNC_mac_settable_ctx_params_fn hmac_settable_ctx_params; +static OSSL_FUNC_mac_set_ctx_params_fn hmac_set_ctx_params; +static OSSL_FUNC_mac_init_fn hmac_init; +static OSSL_FUNC_mac_update_fn hmac_update; +static OSSL_FUNC_mac_final_fn hmac_final; /* local HMAC context structure */ 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 */ diff --git a/providers/implementations/macs/poly1305_prov.c b/providers/implementations/macs/poly1305_prov.c index b14fc35b3e..d25b26ea3b 100644 --- a/providers/implementations/macs/poly1305_prov.c +++ b/providers/implementations/macs/poly1305_prov.c @@ -23,16 +23,16 @@ * 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 poly1305_new; -static OSSL_OP_mac_dupctx_fn poly1305_dup; -static OSSL_OP_mac_freectx_fn poly1305_free; -static OSSL_OP_mac_gettable_params_fn poly1305_gettable_params; -static OSSL_OP_mac_get_params_fn poly1305_get_params; -static OSSL_OP_mac_settable_ctx_params_fn poly1305_settable_ctx_params; -static OSSL_OP_mac_set_ctx_params_fn poly1305_set_ctx_params; -static OSSL_OP_mac_init_fn poly1305_init; -static OSSL_OP_mac_update_fn poly1305_update; -static OSSL_OP_mac_final_fn poly1305_final; +static OSSL_FUNC_mac_newctx_fn poly1305_new; +static OSSL_FUNC_mac_dupctx_fn poly1305_dup; +static OSSL_FUNC_mac_freectx_fn poly1305_free; +static OSSL_FUNC_mac_gettable_params_fn poly1305_gettable_params; +static OSSL_FUNC_mac_get_params_fn poly1305_get_params; +static OSSL_FUNC_mac_settable_ctx_params_fn poly1305_settable_ctx_params; +static OSSL_FUNC_mac_set_ctx_params_fn poly1305_set_ctx_params; +static OSSL_FUNC_mac_init_fn poly1305_init; +static OSSL_FUNC_mac_update_fn poly1305_update; +static OSSL_FUNC_mac_final_fn poly1305_final; struct poly1305_data_st { void *provctx; diff --git a/providers/implementations/macs/siphash_prov.c b/providers/implementations/macs/siphash_prov.c index 4ddcb43d59..78d035d0e1 100644 --- a/providers/implementations/macs/siphash_prov.c +++ b/providers/implementations/macs/siphash_prov.c @@ -30,17 +30,17 @@ * 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 siphash_new; -static OSSL_OP_mac_dupctx_fn siphash_dup; -static OSSL_OP_mac_freectx_fn siphash_free; -static OSSL_OP_mac_gettable_ctx_params_fn siphash_gettable_ctx_params; -static OSSL_OP_mac_get_ctx_params_fn siphash_get_ctx_params; -static OSSL_OP_mac_settable_ctx_params_fn siphash_settable_params; -static OSSL_OP_mac_set_ctx_params_fn siphash_set_params; -static OSSL_OP_mac_size_fn siphash_size; -static OSSL_OP_mac_init_fn siphash_init; -static OSSL_OP_mac_update_fn siphash_update; -static OSSL_OP_mac_final_fn siphash_final; +static OSSL_FUNC_mac_newctx_fn siphash_new; +static OSSL_FUNC_mac_dupctx_fn siphash_dup; +static OSSL_FUNC_mac_freectx_fn siphash_free; +static OSSL_FUNC_mac_gettable_ctx_params_fn siphash_gettable_ctx_params; +static OSSL_FUNC_mac_get_ctx_params_fn siphash_get_ctx_params; +static OSSL_FUNC_mac_settable_ctx_params_fn siphash_settable_params; +static OSSL_FUNC_mac_set_ctx_params_fn siphash_set_params; +static OSSL_FUNC_mac_size_fn siphash_size; +static OSSL_FUNC_mac_init_fn siphash_init; +static OSSL_FUNC_mac_update_fn siphash_update; +static OSSL_FUNC_mac_final_fn siphash_final; struct siphash_data_st { void *provctx; |