Add a deprecated attribute to all CRYPTO_dbg_ functions.

ok deraadt@

2 files changed, 20 insertions, 20 deletions

diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h
index e3cf3ec7a9..a88a5b9888 100644
--- a/src/lib/libcrypto/crypto.h
+++ b/src/lib/libcrypto/crypto.h
@@ -345,11 +345,6 @@ int CRYPTO_is_mem_check_on(void);
 #define MemCheck_start() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON)
 #define MemCheck_stop() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF)
 
-/* for library-internal use */
-#define MemCheck_on()   CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE)
-#define MemCheck_off()  CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE)
-#define is_MemCheck_on() CRYPTO_is_mem_check_on()
-
 #define OPENSSL_malloc(num)     CRYPTO_malloc((int)num,__FILE__,__LINE__)
 #define OPENSSL_strdup(str)     CRYPTO_strdup((str),__FILE__,__LINE__)
 #define OPENSSL_realloc(addr,num) \
@@ -499,9 +494,12 @@ int CRYPTO_remove_all_info(void);
  * 0:   called before the actual memory allocation has taken place
  * 1:   called after the actual memory allocation has taken place
  */
-void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line, int before_p);
-void CRYPTO_dbg_realloc(void *addr1, void *addr2, int num, const char *file, int line, int before_p);
-void CRYPTO_dbg_free(void *addr, int before_p);
+void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line, int before_p)
+        __attribute__ ((deprecated));
+void CRYPTO_dbg_realloc(void *addr1, void *addr2, int num, const char *file, int line, int before_p)
+        __attribute__ ((deprecated));
+void CRYPTO_dbg_free(void *addr, int before_p)
+        __attribute__ ((deprecated));
 /* Tell the debugging code about options.  By default, the following values
  * apply:
  *
@@ -510,8 +508,10 @@ void CRYPTO_dbg_free(void *addr, int before_p);
  * V_CRYPTO_MDEBUG_THREAD (2):  Set the "Show Thread Number" option.
  * V_CRYPTO_MDEBUG_ALL (3):     1 + 2
  */
-void CRYPTO_dbg_set_options(long bits);
-long CRYPTO_dbg_get_options(void);
+void CRYPTO_dbg_set_options(long bits)
+        __attribute__ ((deprecated));
+long CRYPTO_dbg_get_options(void)
+        __attribute__ ((deprecated));
 
 
 void CRYPTO_mem_leaks_fp(FILE *);
diff --git a/src/lib/libssl/src/crypto/crypto.h b/src/lib/libssl/src/crypto/crypto.h
index e3cf3ec7a9..a88a5b9888 100644
--- a/src/lib/libssl/src/crypto/crypto.h
+++ b/src/lib/libssl/src/crypto/crypto.h
@@ -345,11 +345,6 @@ int CRYPTO_is_mem_check_on(void);
 #define MemCheck_start() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON)
 #define MemCheck_stop() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF)
 
-/* for library-internal use */
-#define MemCheck_on()   CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE)
-#define MemCheck_off()  CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE)
-#define is_MemCheck_on() CRYPTO_is_mem_check_on()
-
 #define OPENSSL_malloc(num)     CRYPTO_malloc((int)num,__FILE__,__LINE__)
 #define OPENSSL_strdup(str)     CRYPTO_strdup((str),__FILE__,__LINE__)
 #define OPENSSL_realloc(addr,num) \
@@ -499,9 +494,12 @@ int CRYPTO_remove_all_info(void);
  * 0:   called before the actual memory allocation has taken place
  * 1:   called after the actual memory allocation has taken place
  */
-void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line, int before_p);
-void CRYPTO_dbg_realloc(void *addr1, void *addr2, int num, const char *file, int line, int before_p);
-void CRYPTO_dbg_free(void *addr, int before_p);
+void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line, int before_p)
+        __attribute__ ((deprecated));
+void CRYPTO_dbg_realloc(void *addr1, void *addr2, int num, const char *file, int line, int before_p)
+        __attribute__ ((deprecated));
+void CRYPTO_dbg_free(void *addr, int before_p)
+        __attribute__ ((deprecated));
 /* Tell the debugging code about options.  By default, the following values
  * apply:
  *
@@ -510,8 +508,10 @@ void CRYPTO_dbg_free(void *addr, int before_p);
  * V_CRYPTO_MDEBUG_THREAD (2):  Set the "Show Thread Number" option.
  * V_CRYPTO_MDEBUG_ALL (3):     1 + 2
  */
-void CRYPTO_dbg_set_options(long bits);
-long CRYPTO_dbg_get_options(void);
+void CRYPTO_dbg_set_options(long bits)
+        __attribute__ ((deprecated));
+long CRYPTO_dbg_get_options(void)
+        __attribute__ ((deprecated));
 
 
 void CRYPTO_mem_leaks_fp(FILE *);