From: Pauli Date: Wed, 9 Dec 2020 09:39:27 +0000 (+1000) Subject: rand seed: include lock and unlock functions. X-Git-Tag: openssl-3.0.0-alpha10~107 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8389eeea2cf31ecf8d4ad3e579261cb46151f20a;p=thirdparty%2Fopenssl.git rand seed: include lock and unlock functions. This satisfies EVP's RAND layer. Reviewed-by: Richard Levitte Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/13640) --- diff --git a/providers/implementations/rands/seed_src.c b/providers/implementations/rands/seed_src.c index 7080e95fbf2..95574abd8a9 100644 --- a/providers/implementations/rands/seed_src.c +++ b/providers/implementations/rands/seed_src.c @@ -32,6 +32,8 @@ static OSSL_FUNC_rand_gettable_ctx_params_fn seed_src_gettable_ctx_params; static OSSL_FUNC_rand_get_ctx_params_fn seed_src_get_ctx_params; static OSSL_FUNC_rand_verify_zeroization_fn seed_src_verify_zeroization; static OSSL_FUNC_rand_enable_locking_fn seed_src_enable_locking; +static OSSL_FUNC_rand_lock_fn seed_src_lock; +static OSSL_FUNC_rand_unlock_fn seed_src_unlock; typedef struct { void *provctx; @@ -173,6 +175,15 @@ static int seed_src_enable_locking(ossl_unused void *vseed) return 1; } +int seed_src_lock(ossl_unused void *vctx) +{ + return 1; +} + +void seed_src_unlock(ossl_unused void *vctx) +{ +} + const OSSL_DISPATCH ossl_seed_src_functions[] = { { OSSL_FUNC_RAND_NEWCTX, (void(*)(void))seed_src_new }, { OSSL_FUNC_RAND_FREECTX, (void(*)(void))seed_src_free }, @@ -183,6 +194,8 @@ const OSSL_DISPATCH ossl_seed_src_functions[] = { { OSSL_FUNC_RAND_GENERATE, (void(*)(void))seed_src_generate }, { OSSL_FUNC_RAND_RESEED, (void(*)(void))seed_src_reseed }, { OSSL_FUNC_RAND_ENABLE_LOCKING, (void(*)(void))seed_src_enable_locking }, + { OSSL_FUNC_RAND_LOCK, (void(*)(void))seed_src_lock }, + { OSSL_FUNC_RAND_UNLOCK, (void(*)(void))seed_src_unlock }, { OSSL_FUNC_RAND_GETTABLE_CTX_PARAMS, (void(*)(void))seed_src_gettable_ctx_params }, { OSSL_FUNC_RAND_GET_CTX_PARAMS, (void(*)(void))seed_src_get_ctx_params },