From a16d21744df686a7c005d1f129915d9083476e14 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 26 Apr 2021 11:35:17 +0100 Subject: Add the ability for ex_data to have a priority Where an object has multiple ex_data associated with it, then we free that ex_data in order of priority (high priority first). Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/14991) --- providers/fips/fipsprov.c | 1 + providers/implementations/rands/crngt.c | 1 + providers/implementations/rands/drbg.c | 1 + 3 files changed, 3 insertions(+) (limited to 'providers') diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index 841c80bab7..7998d55d9a 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -96,6 +96,7 @@ static void fips_prov_ossl_ctx_free(void *fgbl) } static const OSSL_LIB_CTX_METHOD fips_prov_ossl_ctx_method = { + OSSL_LIB_CTX_METHOD_DEFAULT_PRIORITY, fips_prov_ossl_ctx_new, fips_prov_ossl_ctx_free, }; diff --git a/providers/implementations/rands/crngt.c b/providers/implementations/rands/crngt.c index f1b31df101..87902c995c 100644 --- a/providers/implementations/rands/crngt.c +++ b/providers/implementations/rands/crngt.c @@ -83,6 +83,7 @@ static void *rand_crng_ossl_ctx_new(OSSL_LIB_CTX *ctx) } static const OSSL_LIB_CTX_METHOD rand_crng_ossl_ctx_method = { + OSSL_LIB_CTX_METHOD_DEFAULT_PRIORITY, rand_crng_ossl_ctx_new, rand_crng_ossl_ctx_free, }; diff --git a/providers/implementations/rands/drbg.c b/providers/implementations/rands/drbg.c index 461d641273..81343fbd52 100644 --- a/providers/implementations/rands/drbg.c +++ b/providers/implementations/rands/drbg.c @@ -303,6 +303,7 @@ static void prov_drbg_nonce_ossl_ctx_free(void *vdngbl) } static const OSSL_LIB_CTX_METHOD drbg_nonce_ossl_ctx_method = { + OSSL_LIB_CTX_METHOD_DEFAULT_PRIORITY, prov_drbg_nonce_ossl_ctx_new, prov_drbg_nonce_ossl_ctx_free, }; -- cgit v1.2.3