diff options
| author | Matt Caswell <matt@openssl.org> | 2021-04-26 14:58:40 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2021-04-28 16:04:25 +0100 |
| commit | 460d2fbcd75bef492638b54c17aa5f5bca7eec2a (patch) | |
| tree | 79bee8f150a242b327ade8c4af55ca3850d194d9 /include/internal | |
| parent | 2d5695016d880b9c6681f293ed5afb0379ce86b7 (diff) | |
Store the list of activated providers in the libctx
The provider config module was storing the list of activated providers
in a global variable. However, because different libctxs can each load
providers via config files we need to keep the list of activated providers
separate and in the libctx.
Partially fixes #15030
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15033)
Diffstat (limited to 'include/internal')
| -rw-r--r-- | include/internal/cryptlib.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h index ea42447e78..e7dd1f65b4 100644 --- a/include/internal/cryptlib.h +++ b/include/internal/cryptlib.h @@ -162,7 +162,8 @@ typedef struct ossl_ex_data_global_st { # define OSSL_LIB_CTX_BIO_PROV_INDEX 13 # define OSSL_LIB_CTX_GLOBAL_PROPERTIES 14 # define OSSL_LIB_CTX_STORE_LOADER_STORE_INDEX 15 -# define OSSL_LIB_CTX_MAX_INDEXES 16 +# define OSSL_LIB_CTX_PROVIDER_CONF_INDEX 16 +# define OSSL_LIB_CTX_MAX_INDEXES 17 typedef struct ossl_lib_ctx_method { void *(*new_func)(OSSL_LIB_CTX *ctx); |