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 /include/crypto | |
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 'include/crypto')
-rw-r--r-- | include/crypto/evp.h | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/include/crypto/evp.h b/include/crypto/evp.h index 1044cad218..ec2fc1c805 100644 --- a/include/crypto/evp.h +++ b/include/crypto/evp.h @@ -157,19 +157,19 @@ struct evp_mac_st { CRYPTO_REF_COUNT refcnt; CRYPTO_RWLOCK *lock; - OSSL_OP_mac_newctx_fn *newctx; - OSSL_OP_mac_dupctx_fn *dupctx; - OSSL_OP_mac_freectx_fn *freectx; - OSSL_OP_mac_size_fn *size; - OSSL_OP_mac_init_fn *init; - OSSL_OP_mac_update_fn *update; - OSSL_OP_mac_final_fn *final; - OSSL_OP_mac_gettable_params_fn *gettable_params; - OSSL_OP_mac_gettable_ctx_params_fn *gettable_ctx_params; - OSSL_OP_mac_settable_ctx_params_fn *settable_ctx_params; - OSSL_OP_mac_get_params_fn *get_params; - OSSL_OP_mac_get_ctx_params_fn *get_ctx_params; - OSSL_OP_mac_set_ctx_params_fn *set_ctx_params; + OSSL_FUNC_mac_newctx_fn *newctx; + OSSL_FUNC_mac_dupctx_fn *dupctx; + OSSL_FUNC_mac_freectx_fn *freectx; + OSSL_FUNC_mac_size_fn *size; + OSSL_FUNC_mac_init_fn *init; + OSSL_FUNC_mac_update_fn *update; + OSSL_FUNC_mac_final_fn *final; + OSSL_FUNC_mac_gettable_params_fn *gettable_params; + OSSL_FUNC_mac_gettable_ctx_params_fn *gettable_ctx_params; + OSSL_FUNC_mac_settable_ctx_params_fn *settable_ctx_params; + OSSL_FUNC_mac_get_params_fn *get_params; + OSSL_FUNC_mac_get_ctx_params_fn *get_ctx_params; + OSSL_FUNC_mac_set_ctx_params_fn *set_ctx_params; }; struct evp_kdf_st { @@ -178,17 +178,17 @@ struct evp_kdf_st { CRYPTO_REF_COUNT refcnt; CRYPTO_RWLOCK *lock; - OSSL_OP_kdf_newctx_fn *newctx; - OSSL_OP_kdf_dupctx_fn *dupctx; - OSSL_OP_kdf_freectx_fn *freectx; - OSSL_OP_kdf_reset_fn *reset; - OSSL_OP_kdf_derive_fn *derive; - OSSL_OP_kdf_gettable_params_fn *gettable_params; - OSSL_OP_kdf_gettable_ctx_params_fn *gettable_ctx_params; - OSSL_OP_kdf_settable_ctx_params_fn *settable_ctx_params; - OSSL_OP_kdf_get_params_fn *get_params; - OSSL_OP_kdf_get_ctx_params_fn *get_ctx_params; - OSSL_OP_kdf_set_ctx_params_fn *set_ctx_params; + OSSL_FUNC_kdf_newctx_fn *newctx; + OSSL_FUNC_kdf_dupctx_fn *dupctx; + OSSL_FUNC_kdf_freectx_fn *freectx; + OSSL_FUNC_kdf_reset_fn *reset; + OSSL_FUNC_kdf_derive_fn *derive; + OSSL_FUNC_kdf_gettable_params_fn *gettable_params; + OSSL_FUNC_kdf_gettable_ctx_params_fn *gettable_ctx_params; + OSSL_FUNC_kdf_settable_ctx_params_fn *settable_ctx_params; + OSSL_FUNC_kdf_get_params_fn *get_params; + OSSL_FUNC_kdf_get_ctx_params_fn *get_ctx_params; + OSSL_FUNC_kdf_set_ctx_params_fn *set_ctx_params; }; struct evp_md_st { @@ -216,19 +216,19 @@ struct evp_md_st { OSSL_PROVIDER *prov; CRYPTO_REF_COUNT refcnt; CRYPTO_RWLOCK *lock; - OSSL_OP_digest_newctx_fn *newctx; - OSSL_OP_digest_init_fn *dinit; - OSSL_OP_digest_update_fn *dupdate; - OSSL_OP_digest_final_fn *dfinal; - OSSL_OP_digest_digest_fn *digest; - OSSL_OP_digest_freectx_fn *freectx; - OSSL_OP_digest_dupctx_fn *dupctx; - OSSL_OP_digest_get_params_fn *get_params; - OSSL_OP_digest_set_ctx_params_fn *set_ctx_params; - OSSL_OP_digest_get_ctx_params_fn *get_ctx_params; - OSSL_OP_digest_gettable_params_fn *gettable_params; - OSSL_OP_digest_settable_ctx_params_fn *settable_ctx_params; - OSSL_OP_digest_gettable_ctx_params_fn *gettable_ctx_params; + OSSL_FUNC_digest_newctx_fn *newctx; + OSSL_FUNC_digest_init_fn *dinit; + OSSL_FUNC_digest_update_fn *dupdate; + OSSL_FUNC_digest_final_fn *dfinal; + OSSL_FUNC_digest_digest_fn *digest; + OSSL_FUNC_digest_freectx_fn *freectx; + OSSL_FUNC_digest_dupctx_fn *dupctx; + OSSL_FUNC_digest_get_params_fn *get_params; + OSSL_FUNC_digest_set_ctx_params_fn *set_ctx_params; + OSSL_FUNC_digest_get_ctx_params_fn *get_ctx_params; + OSSL_FUNC_digest_gettable_params_fn *gettable_params; + OSSL_FUNC_digest_settable_ctx_params_fn *settable_ctx_params; + OSSL_FUNC_digest_gettable_ctx_params_fn *gettable_ctx_params; } /* EVP_MD */ ; @@ -269,20 +269,20 @@ struct evp_cipher_st { OSSL_PROVIDER *prov; CRYPTO_REF_COUNT refcnt; CRYPTO_RWLOCK *lock; - OSSL_OP_cipher_newctx_fn *newctx; - OSSL_OP_cipher_encrypt_init_fn *einit; - OSSL_OP_cipher_decrypt_init_fn *dinit; - OSSL_OP_cipher_update_fn *cupdate; - OSSL_OP_cipher_final_fn *cfinal; - OSSL_OP_cipher_cipher_fn *ccipher; - OSSL_OP_cipher_freectx_fn *freectx; - OSSL_OP_cipher_dupctx_fn *dupctx; - OSSL_OP_cipher_get_params_fn *get_params; - OSSL_OP_cipher_get_ctx_params_fn *get_ctx_params; - OSSL_OP_cipher_set_ctx_params_fn *set_ctx_params; - OSSL_OP_cipher_gettable_params_fn *gettable_params; - OSSL_OP_cipher_gettable_ctx_params_fn *gettable_ctx_params; - OSSL_OP_cipher_settable_ctx_params_fn *settable_ctx_params; + OSSL_FUNC_cipher_newctx_fn *newctx; + OSSL_FUNC_cipher_encrypt_init_fn *einit; + OSSL_FUNC_cipher_decrypt_init_fn *dinit; + OSSL_FUNC_cipher_update_fn *cupdate; + OSSL_FUNC_cipher_final_fn *cfinal; + OSSL_FUNC_cipher_cipher_fn *ccipher; + OSSL_FUNC_cipher_freectx_fn *freectx; + OSSL_FUNC_cipher_dupctx_fn *dupctx; + OSSL_FUNC_cipher_get_params_fn *get_params; + OSSL_FUNC_cipher_get_ctx_params_fn *get_ctx_params; + OSSL_FUNC_cipher_set_ctx_params_fn *set_ctx_params; + OSSL_FUNC_cipher_gettable_params_fn *gettable_params; + OSSL_FUNC_cipher_gettable_ctx_params_fn *gettable_ctx_params; + OSSL_FUNC_cipher_settable_ctx_params_fn *settable_ctx_params; } /* EVP_CIPHER */ ; /* Macros to code block cipher wrappers */ |