diff options
author | Matt Caswell <matt@openssl.org> | 2021-04-26 11:35:17 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2021-05-11 14:56:55 +0100 |
commit | a16d21744df686a7c005d1f129915d9083476e14 (patch) | |
tree | 1ea4d25a974b2f7cfcaafe65a03f9557b8ddc780 /crypto/property | |
parent | d07af736de592602f2831f8559d0302cb116e190 (diff) |
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 <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14991)
Diffstat (limited to 'crypto/property')
-rw-r--r-- | crypto/property/defn_cache.c | 1 | ||||
-rw-r--r-- | crypto/property/property.c | 1 | ||||
-rw-r--r-- | crypto/property/property_string.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/crypto/property/defn_cache.c b/crypto/property/defn_cache.c index 6c6503bdcc..8007599526 100644 --- a/crypto/property/defn_cache.c +++ b/crypto/property/defn_cache.c @@ -63,6 +63,7 @@ static void *property_defns_new(OSSL_LIB_CTX *ctx) { } static const OSSL_LIB_CTX_METHOD property_defns_method = { + OSSL_LIB_CTX_METHOD_DEFAULT_PRIORITY, property_defns_new, property_defns_free, }; diff --git a/crypto/property/property.c b/crypto/property/property.c index 2b841a2204..da6bc84e27 100644 --- a/crypto/property/property.c +++ b/crypto/property/property.c @@ -94,6 +94,7 @@ static void *ossl_ctx_global_properties_new(OSSL_LIB_CTX *ctx) static const OSSL_LIB_CTX_METHOD ossl_ctx_global_properties_method = { + OSSL_LIB_CTX_METHOD_DEFAULT_PRIORITY, ossl_ctx_global_properties_new, ossl_ctx_global_properties_free, }; diff --git a/crypto/property/property_string.c b/crypto/property/property_string.c index 90bb322faa..9eb55cb461 100644 --- a/crypto/property/property_string.c +++ b/crypto/property/property_string.c @@ -105,6 +105,7 @@ err: } static const OSSL_LIB_CTX_METHOD property_string_data_method = { + OSSL_LIB_CTX_METHOD_DEFAULT_PRIORITY, property_string_data_new, property_string_data_free, }; |