summaryrefslogtreecommitdiffstats
path: root/crypto/mem.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-05-29 15:55:13 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-05-29 15:55:13 +0000
commit293c58c1e7bbeecea2b9a3ba81876034b8820073 (patch)
tree746777e59270ad542c8c51b55823fdc4e6674a19 /crypto/mem.c
parent9f375a752ecad52372fae4b70c151aac602ea435 (diff)
Use approved API for EVP digest operations in FIPS builds.
Call OPENSSL_init() in a few more places to make sure it is always called at least once. Initial cipher API redirection (incomplete).
Diffstat (limited to 'crypto/mem.c')
-rw-r--r--crypto/mem.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/mem.c b/crypto/mem.c
index 6f80dd33eb..46a4e6c6dd 100644
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -125,6 +125,7 @@ static long (*get_debug_options_func)(void) = NULL;
int CRYPTO_set_mem_functions(void *(*m)(size_t), void *(*r)(void *, size_t),
void (*f)(void *))
{
+ OPENSSL_init();
if (!allow_customize)
return 0;
if ((m == 0) || (r == 0) || (f == 0))
@@ -184,6 +185,7 @@ int CRYPTO_set_mem_debug_functions(void (*m)(void *,int,const char *,int,int),
void (*so)(long),
long (*go)(void))
{
+ OPENSSL_init();
if (!allow_customize_debug)
return 0;
malloc_debug_func=m;