aboutsummaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
Diffstat (limited to 'crypto')
-rw-r--r--crypto/build.info2
-rw-r--r--crypto/ex_data.c9
-rw-r--r--crypto/mem.c94
-rw-r--r--crypto/mem_dbg.c503
-rw-r--r--crypto/objects/o_names.c12
-rw-r--r--crypto/provider_core.c1
6 files changed, 55 insertions, 566 deletions
diff --git a/crypto/build.info b/crypto/build.info
index 5beaf52..758a75e 100644
--- a/crypto/build.info
+++ b/crypto/build.info
@@ -73,7 +73,7 @@ $UTIL_COMMON=\
$UTIL_DEFINE=$CPUIDDEF
SOURCE[../libcrypto]=$UTIL_COMMON \
- mem.c mem_sec.c mem_dbg.c \
+ mem.c mem_sec.c \
cversion.c info.c cpt_err.c ebcdic.c uid.c o_time.c o_dir.c \
o_fopen.c getenv.c o_init.c o_fips.c init.c trace.c provider.c \
$UPLINKSRC
diff --git a/crypto/ex_data.c b/crypto/ex_data.c
index 58614b6..3cffef8 100644
--- a/crypto/ex_data.c
+++ b/crypto/ex_data.c
@@ -38,13 +38,8 @@ static EX_CALLBACKS *get_and_lock(OPENSSL_CTX *ctx, int class_index)
global = openssl_ctx_get_ex_data_global(ctx);
if (global == NULL || global->ex_data_lock == NULL) {
/*
- * This can happen in normal operation when using CRYPTO_mem_leaks().
- * The CRYPTO_mem_leaks() function calls OPENSSL_cleanup() which cleans
- * up the locks. Subsequently the BIO that CRYPTO_mem_leaks() uses gets
- * freed, which also attempts to free the ex_data. However
- * CRYPTO_mem_leaks() ensures that the ex_data is freed early (i.e.
- * before OPENSSL_cleanup() is called), so if we get here we can safely
- * ignore this operation. We just treat it as an error.
+ * If we get here, someone (who?) cleaned up the lock, so just
+ * treat it as an error.
*/
return NULL;
}
diff --git a/crypto/mem.c b/crypto/mem.c
index d3cac29..f5e8f24 100644
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -14,9 +14,6 @@
#include <stdlib.h>
#include <limits.h>
#include <openssl/crypto.h>
-#if !defined(OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE) && !defined(FIPS_MODE)
-# include <execinfo.h>
-#endif
/*
* the following pointers may be changed as long as 'allow_customize' is set
@@ -43,7 +40,6 @@ static char *md_failstring;
static long md_count;
static int md_fail_percent = 0;
static int md_tracefd = -1;
-static int call_malloc_debug = 1;
static void parseit(void);
static int shouldfail(void);
@@ -51,7 +47,6 @@ static int shouldfail(void);
# define FAILTEST() if (shouldfail()) return NULL
#else
-static int call_malloc_debug = 0;
# define INCREMENT(x) /* empty */
# define FAILTEST() /* empty */
@@ -73,14 +68,6 @@ int CRYPTO_set_mem_functions(
return 1;
}
-int CRYPTO_set_mem_debug(int flag)
-{
- if (!allow_customize)
- return 0;
- call_malloc_debug = flag;
- return 1;
-}
-
void CRYPTO_get_mem_functions(
void *(**m)(size_t, const char *, int),
void *(**r)(void *, size_t, const char *, int),
@@ -209,18 +196,8 @@ void *CRYPTO_malloc(size_t num, const char *file, int line)
*/
allow_customize = 0;
}
-#if !defined(OPENSSL_NO_CRYPTO_MDEBUG) && !defined(FIPS_MODE)
- if (call_malloc_debug) {
- CRYPTO_mem_debug_malloc(NULL, num, 0, file, line);
- ret = malloc(num);
- CRYPTO_mem_debug_malloc(ret, num, 1, file, line);
- } else {
- ret = malloc(num);
- }
-#else
(void)(file); (void)(line);
ret = malloc(num);
-#endif
return ret;
}
@@ -250,17 +227,7 @@ void *CRYPTO_realloc(void *str, size_t num, const char *file, int line)
return NULL;
}
-#if !defined(OPENSSL_NO_CRYPTO_MDEBUG) && !defined(FIPS_MODE)
- if (call_malloc_debug) {
- void *ret;
- CRYPTO_mem_debug_realloc(str, NULL, num, 0, file, line);
- ret = realloc(str, num);
- CRYPTO_mem_debug_realloc(str, ret, num, 1, file, line);
- return ret;
- }
-#else
(void)(file); (void)(line);
-#endif
return realloc(str, num);
}
@@ -300,17 +267,7 @@ void CRYPTO_free(void *str, const char *file, int line)
return;
}
-#if !defined(OPENSSL_NO_CRYPTO_MDEBUG) && !defined(FIPS_MODE)
- if (call_malloc_debug) {
- CRYPTO_mem_debug_free(str, 0, file, line);
- free(str);
- CRYPTO_mem_debug_free(str, 1, file, line);
- } else {
- free(str);
- }
-#else
free(str);
-#endif
}
void CRYPTO_clear_free(void *str, size_t num, const char *file, int line)
@@ -321,3 +278,54 @@ void CRYPTO_clear_free(void *str, size_t num, const char *file, int line)
OPENSSL_cleanse(str, num);
CRYPTO_free(str, file, line);
}
+
+#if !defined(OPENSSL_NO_CRYPTO_MDEBUG)
+
+# ifndef OPENSSL_NO_DEPRECATED_3_0
+int CRYPTO_mem_ctrl(int mode)
+{
+ (void)mode;
+ return -1;
+}
+
+int CRYPTO_set_mem_debug(int flag)
+{
+ (void)flag;
+ return -1;
+}
+
+int CRYPTO_mem_debug_push(const char *info, const char *file, int line)
+{
+ (void)info; (void)file; (void)line;
+ return -1;
+}
+
+int CRYPTO_mem_debug_pop(void)
+{
+ return -1;
+}
+
+int CRYPTO_mem_leaks(BIO *b)
+{
+ (void)b;
+ return -1;
+}
+
+# ifndef OPENSSL_NO_STDIO
+int CRYPTO_mem_leaks_fp(FILE *fp)
+{
+ (void)fp;
+ return -1;
+}
+# endif
+
+int CRYPTO_mem_leaks_cb(int (*cb)(const char *str, size_t len, void *u),
+ void *u)
+{
+ (void)cb; (void)u;
+ return -1;
+}
+
+# endif
+
+#endif
diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c
deleted file mode 100644
index 561dd80..0000000
--- a/crypto/mem_dbg.c
+++ /dev/null
@@ -1,503 +0,0 @@
-/*
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the Apache License 2.0 (the "License"). You may not use
- * this file except in compliance with the License. You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include "internal/cryptlib.h"
-#include "internal/thread_once.h"
-#include <openssl/crypto.h>
-#include <openssl/buffer.h>
-#include "internal/bio.h"
-#include <openssl/lhash.h>
-
-#ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
-# include <execinfo.h>
-#endif
-
-/*
- * The state changes to CRYPTO_MEM_CHECK_ON | CRYPTO_MEM_CHECK_ENABLE when
- * the application asks for it (usually after library initialisation for
- * which no book-keeping is desired). State CRYPTO_MEM_CHECK_ON exists only
- * temporarily when the library thinks that certain allocations should not be
- * checked (e.g. the data structures used for memory checking). It is not
- * suitable as an initial state: the library will unexpectedly enable memory
- * checking when it executes one of those sections that want to disable
- * checking temporarily. State CRYPTO_MEM_CHECK_ENABLE without ..._ON makes
- * no sense whatsoever.
- */
-#ifndef OPENSSL_NO_CRYPTO_MDEBUG
-static int mh_mode = CRYPTO_MEM_CHECK_OFF;
-#endif
-
-#ifndef OPENSSL_NO_CRYPTO_MDEBUG
-static unsigned long order = 0; /* number of memory requests */
-
-static CRYPTO_ONCE memdbg_init = CRYPTO_ONCE_STATIC_INIT;
-CRYPTO_RWLOCK *memdbg_lock;
-static CRYPTO_RWLOCK *long_memdbg_lock;
-
-/* memory-block description */
-struct mem_st {
- void *addr;
- int num;
- const char *file;
- int line;
- CRYPTO_THREAD_ID threadid;
- unsigned long order;
- time_t time;
-#ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
- void *array[30];
- size_t array_siz;
-#endif
-};
-
-/*
- * hash-table of memory requests (address as * key); access requires
- * long_memdbg_lock lock
- */
-static LHASH_OF(MEM) *mh = NULL;
-
-/* num_disable > 0 iff mh_mode == CRYPTO_MEM_CHECK_ON (w/o ..._ENABLE) */
-static unsigned int num_disable = 0;
-
-/*
- * Valid iff num_disable > 0. long_memdbg_lock is locked exactly in this
- * case (by the thread named in disabling_thread).
- */
-static CRYPTO_THREAD_ID disabling_threadid;
-
-DEFINE_RUN_ONCE_STATIC(do_memdbg_init)
-{
- memdbg_lock = CRYPTO_THREAD_lock_new();
- long_memdbg_lock = CRYPTO_THREAD_lock_new();
- if (memdbg_lock == NULL || long_memdbg_lock == NULL) {
- CRYPTO_THREAD_lock_free(memdbg_lock);
- memdbg_lock = NULL;
- CRYPTO_THREAD_lock_free(long_memdbg_lock);
- long_memdbg_lock = NULL;
- return 0;
- }
- return 1;
-}
-
-#endif
-
-int CRYPTO_mem_ctrl(int mode)
-{
-#ifdef OPENSSL_NO_CRYPTO_MDEBUG
- return mode - mode;
-#else
- int ret = mh_mode;
-
- if (!RUN_ONCE(&memdbg_init, do_memdbg_init))
- return -1;
-
- CRYPTO_THREAD_write_lock(memdbg_lock);
- switch (mode) {
- default:
- break;
-
- case CRYPTO_MEM_CHECK_ON:
- mh_mode = CRYPTO_MEM_CHECK_ON | CRYPTO_MEM_CHECK_ENABLE;
- num_disable = 0;
- break;
-
- case CRYPTO_MEM_CHECK_OFF:
- mh_mode = 0;
- num_disable = 0;
- break;
-
- /* switch off temporarily (for library-internal use): */
- case CRYPTO_MEM_CHECK_DISABLE:
- if (mh_mode & CRYPTO_MEM_CHECK_ON) {
- CRYPTO_THREAD_ID cur = CRYPTO_THREAD_get_current_id();
- /* see if we don't have long_memdbg_lock already */
- if (!num_disable
- || !CRYPTO_THREAD_compare_id(disabling_threadid, cur)) {
- /*
- * Long-time lock long_memdbg_lock must not be claimed
- * while we're holding memdbg_lock, or we'll deadlock
- * if somebody else holds long_memdbg_lock (and cannot
- * release it because we block entry to this function). Give
- * them a chance, first, and then claim the locks in
- * appropriate order (long-time lock first).
- */
- CRYPTO_THREAD_unlock(memdbg_lock);
- /*
- * Note that after we have waited for long_memdbg_lock and
- * memdbg_lock, we'll still be in the right "case" and
- * "if" branch because MemCheck_start and MemCheck_stop may
- * never be used while there are multiple OpenSSL threads.
- */
- CRYPTO_THREAD_write_lock(long_memdbg_lock);
- CRYPTO_THREAD_write_lock(memdbg_lock);
- mh_mode &= ~CRYPTO_MEM_CHECK_ENABLE;
- disabling_threadid = cur;
- }
- num_disable++;
- }
- break;
-
- case CRYPTO_MEM_CHECK_ENABLE:
- if (mh_mode & CRYPTO_MEM_CHECK_ON) {
- if (num_disable) { /* always true, or something is going wrong */
- num_disable--;
- if (num_disable == 0) {
- mh_mode |= CRYPTO_MEM_CHECK_ENABLE;
- CRYPTO_THREAD_unlock(long_memdbg_lock);
- }
- }
- }
- break;
- }
- CRYPTO_THREAD_unlock(memdbg_lock);
- return ret;
-#endif
-}
-
-#ifndef OPENSSL_NO_CRYPTO_MDEBUG
-
-static int mem_check_on(void)
-{
- int ret = 0;
- CRYPTO_THREAD_ID cur;
-
- if (mh_mode & CRYPTO_MEM_CHECK_ON) {
- if (!RUN_ONCE(&memdbg_init, do_memdbg_init))
- return 0;
-
- cur = CRYPTO_THREAD_get_current_id();
- CRYPTO_THREAD_read_lock(memdbg_lock);
-
- ret = (mh_mode & CRYPTO_MEM_CHECK_ENABLE)
- || !CRYPTO_THREAD_compare_id(disabling_threadid, cur);
-
- CRYPTO_THREAD_unlock(memdbg_lock);
- }
- return ret;
-}
-
-static int mem_cmp(const MEM *a, const MEM *b)
-{
-#ifdef _WIN64
- const char *ap = (const char *)a->addr, *bp = (const char *)b->addr;
- if (ap == bp)
- return 0;
- else if (ap > bp)
- return 1;
- else
- return -1;
-#else
- return (const char *)a->addr - (const char *)b->addr;
-#endif
-}
-
-static unsigned long mem_hash(const MEM *a)
-{
- size_t ret;
-
- ret = (size_t)a->addr;
-
- ret = ret * 17851 + (ret >> 14) * 7 + (ret >> 4) * 251;
- return ret;
-}
-
-#ifndef OPENSSL_NO_DEPRECATED_3_0
-int CRYPTO_mem_debug_push(const char *info, const char *file, int line)
-{
- return 0;
-}
-
-int CRYPTO_mem_debug_pop(void)
-{
- return 0;
-}
-#endif
-
-static unsigned long break_order_num = 0;
-
-void CRYPTO_mem_debug_malloc(void *addr, size_t num, int before_p,
- const char *file, int line)
-{
- MEM *m, *mm;
-
- switch (before_p & 127) {
- case 0:
- break;
- case 1:
- if (addr == NULL)
- break;
-
- if (mem_check_on()) {
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE);
-
- if (!RUN_ONCE(&memdbg_init, do_memdbg_init)
- || (m = OPENSSL_malloc(sizeof(*m))) == NULL) {
- OPENSSL_free(addr);
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE);
- return;
- }
- if (mh == NULL) {
- if ((mh = lh_MEM_new(mem_hash, mem_cmp)) == NULL) {
- OPENSSL_free(addr);
- OPENSSL_free(m);
- addr = NULL;
- goto err;
- }
- }
-
- m->addr = addr;
- m->file = file;
- m->line = line;
- m->num = num;
- m->threadid = CRYPTO_THREAD_get_current_id();
-
- if (order == break_order_num) {
- /* BREAK HERE */
- m->order = order;
- }
- m->order = order++;
-# ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
- m->array_siz = backtrace(m->array, OSSL_NELEM(m->array));
-# endif
- m->time = time(NULL);
-
- if ((mm = lh_MEM_insert(mh, m)) != NULL)
- OPENSSL_free(mm);
- err:
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE);
- }
- break;
- }
- return;
-}
-
-void CRYPTO_mem_debug_free(void *addr, int before_p,
- const char *file, int line)
-{
- MEM m, *mp;
-
- switch (before_p) {
- case 0:
- if (addr == NULL)
- break;
-
- if (mem_check_on() && (mh != NULL)) {
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE);
- m.addr = addr;
- mp = lh_MEM_delete(mh, &m);
- OPENSSL_free(mp);
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE);
- }
- break;
- case 1:
- break;
- }
-}
-
-void CRYPTO_mem_debug_realloc(void *addr1, void *addr2, size_t num,
- int before_p, const char *file, int line)
-{
- MEM m, *mp;
-
- switch (before_p) {
- case 0:
- break;
- case 1:
- if (addr2 == NULL)
- break;
-
- if (addr1 == NULL) {
- CRYPTO_mem_debug_malloc(addr2, num, 128 | before_p, file, line);
- break;
- }
-
- if (mem_check_on()) {
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE);
-
- m.addr = addr1;
- mp = lh_MEM_delete(mh, &m);
- if (mp != NULL) {
- mp->addr = addr2;
- mp->num = num;
-#ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
- mp->array_siz = backtrace(mp->array, OSSL_NELEM(mp->array));
-#endif
- (void)lh_MEM_insert(mh, mp);
- }
-
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE);
- }
- break;
- }
- return;
-}
-
-typedef struct mem_leak_st {
- int (*print_cb) (const char *str, size_t len, void *u);
- void *print_cb_arg;
- int chunks;
- long bytes;
-} MEM_LEAK;
-
-static void print_leak(const MEM *m, MEM_LEAK *l)
-{
- char buf[1024];
- char *bufp = buf, *hex;
- size_t len = sizeof(buf);
- int n;
- struct tm *lcl = NULL;
-
- lcl = localtime(&m->time);
- n = BIO_snprintf(bufp, len, "[%02d:%02d:%02d] ",
- lcl->tm_hour, lcl->tm_min, lcl->tm_sec);
- if (n <= 0) {
- bufp[0] = '\0';
- return;
- }
- bufp += n;
- len -= n;
-
- n = BIO_snprintf(bufp, len, "%5lu file=%s, line=%d, ",
- m->order, m->file, m->line);
- if (n <= 0)
- return;
- bufp += n;
- len -= n;
-
- hex = OPENSSL_buf2hexstr((const unsigned char *)&m->threadid,
- sizeof(m->threadid));
- n = BIO_snprintf(bufp, len, "thread=%s, number=%d, address=%p\n",
- hex == NULL ? "<null>" : hex, m->num, m->addr);
- OPENSSL_free(hex);
- if (n <= 0)
- return;
- bufp += n;
- len -= n;
-
- l->print_cb(buf, (size_t)(bufp - buf), l->print_cb_arg);
- l->chunks++;
- l->bytes += m->num;
-
-#ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
- {
- size_t i;
- char **strings = backtrace_symbols(m->array, m->array_siz);
-
- for (i = 0; i < m->array_siz; i++)
- fprintf(stderr, "##> %s\n", strings[i]);
- free(strings);
- }
-#endif
-}
-
-IMPLEMENT_LHASH_DOALL_ARG_CONST(MEM, MEM_LEAK);
-
-int CRYPTO_mem_leaks_cb(int (*cb) (const char *str, size_t len, void *u),
- void *u)
-{
- MEM_LEAK ml;
-
- /* Ensure all resources are released */
- OPENSSL_cleanup();
-
- if (!RUN_ONCE(&memdbg_init, do_memdbg_init))
- return -1;
-
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE);
-
- ml.print_cb = cb;
- ml.print_cb_arg = u;
- ml.bytes = 0;
- ml.chunks = 0;
- if (mh != NULL)
- lh_MEM_doall_MEM_LEAK(mh, print_leak, &ml);
-
- if (ml.chunks != 0) {
- char buf[256];
-
- BIO_snprintf(buf, sizeof(buf), "%ld bytes leaked in %d chunks\n",
- ml.bytes, ml.chunks);
- cb(buf, strlen(buf), u);
- } else {
- /*
- * Make sure that, if we found no leaks, memory-leak debugging itself
- * does not introduce memory leaks (which might irritate external
- * debugging tools). (When someone enables leak checking, but does not
- * call this function, we declare it to be their fault.)
- */
- int old_mh_mode;
-
- CRYPTO_THREAD_write_lock(memdbg_lock);
-
- /*
- * avoid deadlock when lh_free() uses CRYPTO_mem_debug_free(), which uses
- * mem_check_on
- */
- old_mh_mode = mh_mode;
- mh_mode = CRYPTO_MEM_CHECK_OFF;
-
- lh_MEM_free(mh);
- mh = NULL;
-
- mh_mode = old_mh_mode;
- CRYPTO_THREAD_unlock(memdbg_lock);
- }
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF);
-
- /* Clean up locks etc */
- CRYPTO_THREAD_lock_free(memdbg_lock);
- CRYPTO_THREAD_lock_free(long_memdbg_lock);
- memdbg_lock = NULL;
- long_memdbg_lock = NULL;
-
- return ml.chunks == 0 ? 1 : 0;
-}
-
-static int print_bio(const char *str, size_t len, void *b)
-{
- return BIO_write((BIO *)b, str, len);
-}
-
-int CRYPTO_mem_leaks(BIO *b)
-{
- /*
- * OPENSSL_cleanup() will free the ex_data locks so we can't have any
- * ex_data hanging around
- */
- bio_free_ex_data(b);
-
- return CRYPTO_mem_leaks_cb(print_bio, b);
-}
-
-# ifndef OPENSSL_NO_STDIO
-int CRYPTO_mem_leaks_fp(FILE *fp)
-{
- BIO *b;
- int ret;
-
- /*
- * Need to turn off memory checking when allocated BIOs ... especially as
- * we're creating them at a time when we're trying to check we've not
- * left anything un-free()'d!!
- */
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE);
- b = BIO_new(BIO_s_file());
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE);
- if (b == NULL)
- return -1;
- BIO_set_fp(b, fp, BIO_NOCLOSE);
- ret = CRYPTO_mem_leaks_cb(print_bio, b);
- BIO_free(b);
- return ret;
-}
-# endif
-
-#endif
diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c
index 52956eb..5835ab6 100644
--- a/crypto/objects/o_names.c
+++ b/crypto/objects/o_names.c
@@ -66,10 +66,8 @@ static int obj_name_cmp(const OBJ_NAME *a, const OBJ_NAME *b);
static CRYPTO_ONCE init = CRYPTO_ONCE_STATIC_INIT;
DEFINE_RUN_ONCE_STATIC(o_names_init)
{
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE);
names_lh = lh_OBJ_NAME_new(obj_name_hash, obj_name_cmp);
obj_lock = CRYPTO_THREAD_lock_new();
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE);
return names_lh != NULL && obj_lock != NULL;
}
@@ -90,11 +88,8 @@ int OBJ_NAME_new_index(unsigned long (*hash_func) (const char *),
CRYPTO_THREAD_write_lock(obj_lock);
- if (name_funcs_stack == NULL) {
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE);
+ if (name_funcs_stack == NULL)
name_funcs_stack = sk_NAME_FUNCS_new_null();
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE);
- }
if (name_funcs_stack == NULL) {
/* ERROR */
goto out;
@@ -102,9 +97,7 @@ int OBJ_NAME_new_index(unsigned long (*hash_func) (const char *),
ret = names_type_num;
names_type_num++;
for (i = sk_NAME_FUNCS_num(name_funcs_stack); i < names_type_num; i++) {
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE);
name_funcs = OPENSSL_zalloc(sizeof(*name_funcs));
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE);
if (name_funcs == NULL) {
OBJerr(OBJ_F_OBJ_NAME_NEW_INDEX, ERR_R_MALLOC_FAILURE);
ret = 0;
@@ -112,10 +105,7 @@ int OBJ_NAME_new_index(unsigned long (*hash_func) (const char *),
}
name_funcs->hash_func = openssl_lh_strcasehash;
name_funcs->cmp_func = obj_strcasecmp;
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE);
-
push = sk_NAME_FUNCS_push(name_funcs_stack, name_funcs);
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE);
if (!push) {
OBJerr(OBJ_F_OBJ_NAME_NEW_INDEX, ERR_R_MALLOC_FAILURE);
diff --git a/crypto/provider_core.c b/crypto/provider_core.c
index c7c579a..c95615f 100644
--- a/crypto/provider_core.c
+++ b/crypto/provider_core.c
@@ -890,7 +890,6 @@ 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 }
};