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/kdfs/krb5kdf.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/kdfs/krb5kdf.c')
| -rw-r--r-- | providers/implementations/kdfs/krb5kdf.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/providers/implementations/kdfs/krb5kdf.c b/providers/implementations/kdfs/krb5kdf.c index 0a97b8e3f9..4ae29a24c4 100644 --- a/providers/implementations/kdfs/krb5kdf.c +++ b/providers/implementations/kdfs/krb5kdf.c @@ -32,14 +32,14 @@ /* KRB5 KDF defined in RFC 3961, Section 5.1 */ -static OSSL_OP_kdf_newctx_fn krb5kdf_new; -static OSSL_OP_kdf_freectx_fn krb5kdf_free; -static OSSL_OP_kdf_reset_fn krb5kdf_reset; -static OSSL_OP_kdf_derive_fn krb5kdf_derive; -static OSSL_OP_kdf_settable_ctx_params_fn krb5kdf_settable_ctx_params; -static OSSL_OP_kdf_set_ctx_params_fn krb5kdf_set_ctx_params; -static OSSL_OP_kdf_gettable_ctx_params_fn krb5kdf_gettable_ctx_params; -static OSSL_OP_kdf_get_ctx_params_fn krb5kdf_get_ctx_params; +static OSSL_FUNC_kdf_newctx_fn krb5kdf_new; +static OSSL_FUNC_kdf_freectx_fn krb5kdf_free; +static OSSL_FUNC_kdf_reset_fn krb5kdf_reset; +static OSSL_FUNC_kdf_derive_fn krb5kdf_derive; +static OSSL_FUNC_kdf_settable_ctx_params_fn krb5kdf_settable_ctx_params; +static OSSL_FUNC_kdf_set_ctx_params_fn krb5kdf_set_ctx_params; +static OSSL_FUNC_kdf_gettable_ctx_params_fn krb5kdf_gettable_ctx_params; +static OSSL_FUNC_kdf_get_ctx_params_fn krb5kdf_get_ctx_params; static int KRB5KDF(const EVP_CIPHER *cipher, ENGINE *engine, const unsigned char *key, size_t key_len, |