summaryrefslogtreecommitdiffstats
path: root/crypto/store
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2021-06-14 13:08:38 +0200
committerMatt Caswell <matt@openssl.org>2021-06-16 12:06:30 +0200
commit5a5d90ffac78ac17e7a078a501bb33e1080c0935 (patch)
treea178d5dc04fb17f0e3722fb917ad0f0286124cfb /crypto/store
parentapps: remove AEAD/mode checks that are now redundant (diff)
downloadopenssl-5a5d90ffac78ac17e7a078a501bb33e1080c0935.tar.xz
openssl-5a5d90ffac78ac17e7a078a501bb33e1080c0935.zip
Clean up the encoder/decoder/loader stores before providers
We already had the evp method store being cleaned up before the provider store was. This prevents issues where the method clean up functions cause providers to clean up, which then needs access to the provider store. We extend the same thinking to the encoder/decoder/loader stores. Fixes #15727 Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15741)
Diffstat (limited to 'crypto/store')
-rw-r--r--crypto/store/store_meth.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/store/store_meth.c b/crypto/store/store_meth.c
index 7b2f537d49..720b70c0e0 100644
--- a/crypto/store/store_meth.c
+++ b/crypto/store/store_meth.c
@@ -81,7 +81,8 @@ static void *loader_store_new(OSSL_LIB_CTX *ctx)
static const OSSL_LIB_CTX_METHOD loader_store_method = {
- OSSL_LIB_CTX_METHOD_DEFAULT_PRIORITY,
+ /* We want loader_store to be cleaned up before the provider store */
+ OSSL_LIB_CTX_METHOD_PRIORITY_2,
loader_store_new,
loader_store_free,
};