summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorBodo Möller <bodo@openssl.org>1999-07-19 09:25:35 +0000
committerBodo Möller <bodo@openssl.org>1999-07-19 09:25:35 +0000
commit458cddc1042eb91c5bb1e2bffd8fcfe5ee960d4d (patch)
tree9c379735139ac1b641f355f0bf60b5d7fdb23c2a /crypto
parent3dff94c2e4f48a1f222aba613d2cee2911ea9c3f (diff)
Have CRYPTO_MDEBUG_TIME automatically set CRYPTO_MDEBUG,
and make it the default for some debugging configurations.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/crypto.h6
-rw-r--r--crypto/des/Makefile.ssl4
-rw-r--r--crypto/mem.c1
3 files changed, 9 insertions, 2 deletions
diff --git a/crypto/crypto.h b/crypto/crypto.h
index 1b927e189d..fe8292fcbe 100644
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -200,6 +200,12 @@ typedef struct crypto_ex_data_func_st
(char *(*)())realloc,\
(void (*)())free)
+#ifdef CRYPTO_MDEBUG_TIME
+# ifndef CRYPTO_MDEBUG /* avoid duplicate #define */
+# define CRYPTO_MDEBUG
+# endif
+#endif
+
#ifdef CRYPTO_MDEBUG
#define MemCheck_start() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON)
#define MemCheck_stop() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF)
diff --git a/crypto/des/Makefile.ssl b/crypto/des/Makefile.ssl
index bedd865d95..09fdd07305 100644
--- a/crypto/des/Makefile.ssl
+++ b/crypto/des/Makefile.ssl
@@ -168,8 +168,8 @@ enc_writ.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
enc_writ.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
enc_writ.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
enc_writ.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-enc_writ.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
-enc_writ.o: ../cryptlib.h des_locl.h
+enc_writ.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
+enc_writ.o: ../../include/openssl/stack.h ../cryptlib.h des_locl.h
fcrypt.o: ../../include/openssl/des.h ../../include/openssl/des.h
fcrypt.o: ../../include/openssl/e_os2.h ../../include/openssl/e_os2.h
fcrypt.o: ../../include/openssl/opensslconf.h
diff --git a/crypto/mem.c b/crypto/mem.c
index 9693842ec3..77df806298 100644
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -58,6 +58,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <openssl/crypto.h>
#ifdef CRYPTO_MDEBUG_TIME
# include <time.h>
#endif