diff options
| author | Matt Caswell <matt@openssl.org> | 2019-08-14 15:00:35 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-08-29 10:50:47 +0100 |
| commit | 505f46602043c7c28884e4c13f3cfa9419ae2f15 (patch) | |
| tree | 0c58220dd5f6b3f5d29e0a832b20dfa4a0e5872a /crypto/property | |
| parent | 770de3462c0d655a6543a6c1a2c0bda7b57178f9 (diff) | |
Make sure we pre-initialise properties
Simplify the initialisation of the core by pre-initialising properties.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9590)
Diffstat (limited to 'crypto/property')
| -rw-r--r-- | crypto/property/property.c | 11 | ||||
| -rw-r--r-- | crypto/property/property_lcl.h | 1 |
2 files changed, 0 insertions, 12 deletions
diff --git a/crypto/property/property.c b/crypto/property/property.c index 182ea6454b..e94c5de87d 100644 --- a/crypto/property/property.c +++ b/crypto/property/property.c @@ -84,12 +84,6 @@ int ossl_property_unlock(OSSL_METHOD_STORE *p) return p != 0 ? CRYPTO_THREAD_unlock(p->lock) : 0; } -static openssl_ctx_run_once_fn do_method_store_init; -int do_method_store_init(OPENSSL_CTX *ctx) -{ - return ossl_property_parse_init(ctx); -} - static unsigned long query_hash(const QUERY *a) { return OPENSSL_LH_strhash(a->query); @@ -132,11 +126,6 @@ OSSL_METHOD_STORE *ossl_method_store_new(OPENSSL_CTX *ctx) { OSSL_METHOD_STORE *res; - if (!openssl_ctx_run_once(ctx, - OPENSSL_CTX_METHOD_STORE_RUN_ONCE_INDEX, - do_method_store_init)) - return NULL; - res = OPENSSL_zalloc(sizeof(*res)); if (res != NULL) { res->ctx = ctx; diff --git a/crypto/property/property_lcl.h b/crypto/property/property_lcl.h index 5fa34cea82..25cfde4649 100644 --- a/crypto/property/property_lcl.h +++ b/crypto/property/property_lcl.h @@ -21,7 +21,6 @@ OSSL_PROPERTY_IDX ossl_property_value(OPENSSL_CTX *ctx, const char *s, int create); /* Property list functions */ -int ossl_property_parse_init(OPENSSL_CTX *ctx); void ossl_property_free(OSSL_PROPERTY_LIST *p); int ossl_property_has_optional(const OSSL_PROPERTY_LIST *query); int ossl_property_match_count(const OSSL_PROPERTY_LIST *query, |