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/ciphers/cipher_chacha20.c | |
| 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/ciphers/cipher_chacha20.c')
| -rw-r--r-- | providers/implementations/ciphers/cipher_chacha20.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/providers/implementations/ciphers/cipher_chacha20.c b/providers/implementations/ciphers/cipher_chacha20.c index d92fa08d0c..3d51c2a2a3 100644 --- a/providers/implementations/ciphers/cipher_chacha20.c +++ b/providers/implementations/ciphers/cipher_chacha20.c @@ -19,13 +19,13 @@ /* TODO(3.0) Figure out what flags are required */ #define CHACHA20_FLAGS (EVP_CIPH_CUSTOM_IV | EVP_CIPH_ALWAYS_CALL_INIT) -static OSSL_OP_cipher_newctx_fn chacha20_newctx; -static OSSL_OP_cipher_freectx_fn chacha20_freectx; -static OSSL_OP_cipher_get_params_fn chacha20_get_params; -static OSSL_OP_cipher_get_ctx_params_fn chacha20_get_ctx_params; -static OSSL_OP_cipher_set_ctx_params_fn chacha20_set_ctx_params; -static OSSL_OP_cipher_gettable_ctx_params_fn chacha20_gettable_ctx_params; -static OSSL_OP_cipher_settable_ctx_params_fn chacha20_settable_ctx_params; +static OSSL_FUNC_cipher_newctx_fn chacha20_newctx; +static OSSL_FUNC_cipher_freectx_fn chacha20_freectx; +static OSSL_FUNC_cipher_get_params_fn chacha20_get_params; +static OSSL_FUNC_cipher_get_ctx_params_fn chacha20_get_ctx_params; +static OSSL_FUNC_cipher_set_ctx_params_fn chacha20_set_ctx_params; +static OSSL_FUNC_cipher_gettable_ctx_params_fn chacha20_gettable_ctx_params; +static OSSL_FUNC_cipher_settable_ctx_params_fn chacha20_settable_ctx_params; #define chacha20_cipher cipher_generic_cipher #define chacha20_update cipher_generic_stream_update #define chacha20_final cipher_generic_stream_final |