summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2019-09-19 11:52:45 +0100
committerMatt Caswell <matt@openssl.org>2019-11-29 16:14:44 +0000
commitcc38e643cbfb6da84fb2bb6a188698d0bc082a20 (patch)
treed07a3fcee80701c7511f7c54a696224282a0fdef /crypto
parent14a684bfb091b12aa3094a6097932f76f799990a (diff)
Disable mem leak checking for the self test lock
The fips self test lock is deallocated in platform specific ways that may occur after we do mem leak checking. If we don't know how to free it for a particular platform then we just leak it deliberately. So we temporarily disable the mem leak checking while we allocate the lock. Reviewed-by: Paul Dale <paul.dale@oracle.com> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9939)
Diffstat (limited to 'crypto')
-rw-r--r--crypto/provider_core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/provider_core.c b/crypto/provider_core.c
index 4f3123d672..9e92e96b10 100644
--- a/crypto/provider_core.c
+++ b/crypto/provider_core.c
@@ -889,6 +889,7 @@ static const OSSL_DISPATCH core_dispatch_[] = {
{ OSSL_FUNC_CRYPTO_SECURE_ALLOCATED,
(void (*)(void))CRYPTO_secure_allocated },
{ OSSL_FUNC_OPENSSL_CLEANSE, (void (*)(void))OPENSSL_cleanse },
+ { OSSL_FUNC_CRYPTO_MEM_CTRL, (void (*)(void))CRYPTO_mem_ctrl },
{ 0, NULL }
};