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 /include/internal/core.h | |
| parent | Modify ossl_method_store_add() to handle reference counting (diff) | |
| download | openssl-c1d56231ef6385b557ec72eec508e55ea26ca8b0.tar.xz openssl-c1d56231ef6385b557ec72eec508e55ea26ca8b0.zip | |
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 'include/internal/core.h')
| -rw-r--r-- | include/internal/core.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/internal/core.h b/include/internal/core.h index bd2f9a0989..a40d3c69af 100644 --- a/include/internal/core.h +++ b/include/internal/core.h @@ -37,8 +37,8 @@ typedef struct ossl_method_construct_method_st { void *data); /* Store a method in a store */ int (*put)(OPENSSL_CTX *libctx, void *store, void *method, - int operation_id, const char *name, const char *propdef, - void *data); + const OSSL_PROVIDER *prov, int operation_id, const char *name, + const char *propdef, void *data); /* Construct a new method */ void *(*construct)(const char *name, const OSSL_DISPATCH *fns, OSSL_PROVIDER *prov, void *data); |