From ad6019d6c0d22f384838b2f9ca339bdabed331a5 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Thu, 27 Jan 2011 14:27:24 +0000 Subject: Move locking and thread ID functions into new files lock.c and thr_id.c, redirect locking to minimal FIPS_lock() function where required. --- crypto/mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crypto/mem.c') diff --git a/crypto/mem.c b/crypto/mem.c index 6f80dd33eb..347c0d8184 100644 --- a/crypto/mem.c +++ b/crypto/mem.c @@ -101,7 +101,7 @@ static void (*free_locked_func)(void *) = free; /* may be changed as long as 'allow_customize_debug' is set */ /* XXX use correct function pointer types */ -#ifdef CRYPTO_MDEBUG +#if defined(CRYPTO_MDEBUG) && !defined(OPENSSL_FIPSCANISTER) /* use default functions from mem_dbg.c */ static void (*malloc_debug_func)(void *,int,const char *,int,int) = CRYPTO_dbg_malloc; -- cgit v1.2.3