diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-08-21 10:08:44 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-08-22 01:50:30 +0200 |
| commit | c1d56231ef6385b557ec72eec508e55ea26ca8b0 (patch) | |
| tree | c813f45c7adc28816afbd199b5df4d972fc54019 /crypto/property | |
| parent | b1d40ddfe23fd9551b89cdcfa52d1c23fc667f8a (diff) | |
Modify ossl_method_store_add() to accept an OSSL_PROVIDER and check for it
If ossl_method_store_add() gets called with a method that already exists
(i.e. the store has one with matching provider, nid and properties), that
method should not be stored. We do this check inside ossl_method_store_add()
because it has all the locking required to do so safely.
Fixes #9561
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9650)
Diffstat (limited to 'crypto/property')
| -rw-r--r-- | crypto/property/property.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/crypto/property/property.c b/crypto/property/property.c index 6576ba0fd2..182ea6454b 100644 --- a/crypto/property/property.c +++ b/crypto/property/property.c @@ -25,6 +25,7 @@ #define IMPL_CACHE_FLUSH_THRESHOLD 500 typedef struct { + const OSSL_PROVIDER *provider; OSSL_PROPERTY_LIST *properties; void *method; void (*method_destruct)(void *); @@ -173,7 +174,7 @@ static int ossl_method_store_insert(OSSL_METHOD_STORE *store, ALGORITHM *alg) return ossl_sa_ALGORITHM_set(store->algs, alg->nid, alg); } -int ossl_method_store_add(OSSL_METHOD_STORE *store, +int ossl_method_store_add(OSSL_METHOD_STORE *store, const OSSL_PROVIDER *prov, int nid, const char *properties, void *method, int (*method_up_ref)(void *), void (*method_destruct)(void *)) @@ -181,6 +182,7 @@ int ossl_method_store_add(OSSL_METHOD_STORE *store, ALGORITHM *alg = NULL; IMPLEMENTATION *impl; int ret = 0; + int i; if (nid <= 0 || method == NULL || store == NULL) return 0; @@ -191,8 +193,11 @@ int ossl_method_store_add(OSSL_METHOD_STORE *store, impl = OPENSSL_malloc(sizeof(*impl)); if (impl == NULL) return 0; - if (method_up_ref != NULL && !method_up_ref(method)) + if (method_up_ref != NULL && !method_up_ref(method)) { + OPENSSL_free(impl); return 0; + } + impl->provider = prov; impl->method = method; impl->method_destruct = method_destruct; @@ -222,8 +227,16 @@ int ossl_method_store_add(OSSL_METHOD_STORE *store, goto err; } - /* Push onto stack */ - if (sk_IMPLEMENTATION_push(alg->impls, impl)) + /* Push onto stack if there isn't one there already */ + for (i = 0; i < sk_IMPLEMENTATION_num(alg->impls); i++) { + const IMPLEMENTATION *tmpimpl = sk_IMPLEMENTATION_value(alg->impls, i); + + if (tmpimpl->provider == impl->provider + && tmpimpl->properties == impl->properties) + break; + } + if (i == sk_IMPLEMENTATION_num(alg->impls) + && sk_IMPLEMENTATION_push(alg->impls, impl)) ret = 1; ossl_property_unlock(store); if (ret == 0) |