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/rands/drbg_hash.c | |
| parent | 23c48d94d4d34eedc15fa65e0fa0e38a6137e09f (diff) | |
| download | openssl-new-363b1e5daea4a01889e6ff27148018be63d33b9b.tar.gz | |
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/rands/drbg_hash.c')
| -rw-r--r-- | providers/implementations/rands/drbg_hash.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/providers/implementations/rands/drbg_hash.c b/providers/implementations/rands/drbg_hash.c index 62a976827a..418a641b7f 100644 --- a/providers/implementations/rands/drbg_hash.c +++ b/providers/implementations/rands/drbg_hash.c @@ -14,7 +14,7 @@ #include <openssl/crypto.h> #include <openssl/err.h> #include <openssl/rand.h> -#include <openssl/core_numbers.h> +#include <openssl/core_dispatch.h> #include "internal/thread_once.h" #include "prov/providercommon.h" #include "prov/provider_ctx.h" @@ -23,17 +23,17 @@ #include "prov/providercommonerr.h" #include "drbg_local.h" -static OSSL_OP_rand_newctx_fn drbg_hash_new_wrapper; -static OSSL_OP_rand_freectx_fn drbg_hash_free; -static OSSL_OP_rand_instantiate_fn drbg_hash_instantiate_wrapper; -static OSSL_OP_rand_uninstantiate_fn drbg_hash_uninstantiate_wrapper; -static OSSL_OP_rand_generate_fn drbg_hash_generate_wrapper; -static OSSL_OP_rand_reseed_fn drbg_hash_reseed_wrapper; -static OSSL_OP_rand_settable_ctx_params_fn drbg_hash_settable_ctx_params; -static OSSL_OP_rand_set_ctx_params_fn drbg_hash_set_ctx_params; -static OSSL_OP_rand_gettable_ctx_params_fn drbg_hash_gettable_ctx_params; -static OSSL_OP_rand_get_ctx_params_fn drbg_hash_get_ctx_params; -static OSSL_OP_rand_verify_zeroization_fn drbg_hash_verify_zeroization; +static OSSL_FUNC_rand_newctx_fn drbg_hash_new_wrapper; +static OSSL_FUNC_rand_freectx_fn drbg_hash_free; +static OSSL_FUNC_rand_instantiate_fn drbg_hash_instantiate_wrapper; +static OSSL_FUNC_rand_uninstantiate_fn drbg_hash_uninstantiate_wrapper; +static OSSL_FUNC_rand_generate_fn drbg_hash_generate_wrapper; +static OSSL_FUNC_rand_reseed_fn drbg_hash_reseed_wrapper; +static OSSL_FUNC_rand_settable_ctx_params_fn drbg_hash_settable_ctx_params; +static OSSL_FUNC_rand_set_ctx_params_fn drbg_hash_set_ctx_params; +static OSSL_FUNC_rand_gettable_ctx_params_fn drbg_hash_gettable_ctx_params; +static OSSL_FUNC_rand_get_ctx_params_fn drbg_hash_get_ctx_params; +static OSSL_FUNC_rand_verify_zeroization_fn drbg_hash_verify_zeroization; /* 888 bits from SP800-90Ar1 10.1 table 2 */ #define HASH_PRNG_MAX_SEEDLEN (888/8) |