From 7bd8d08041b89523346a09c46782711534e585e0 Mon Sep 17 00:00:00 2001
From: beck <>
Date: Thu, 22 May 2014 21:57:25 +0000
Subject: Mark the malloc wrapper functions as deprecated so warnings will
 happen on their use. ok miod@

---
 src/lib/libcrypto/crypto.h         | 20 ++++++++++++--------
 src/lib/libssl/src/crypto/crypto.h | 20 ++++++++++++--------
 2 files changed, 24 insertions(+), 16 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h
index 00d3cc2aae..df0701a02d 100644
--- a/src/lib/libcrypto/crypto.h
+++ b/src/lib/libcrypto/crypto.h
@@ -471,20 +471,24 @@ void CRYPTO_get_mem_debug_functions(
     void (**r)(void *, void *, int, const char *, int, int),
     void (**f)(void *, int), void (**so)(long), long (**go)(void));
 
-void *CRYPTO_malloc_locked(int num, const char *file, int line);
-void CRYPTO_free_locked(void *ptr);
-void *CRYPTO_malloc(int num, const char *file, int line);
-char *CRYPTO_strdup(const char *str, const char *file, int line);
-void CRYPTO_free(void *ptr);
-void *CRYPTO_realloc(void *addr, int num, const char *file, int line);
+void *CRYPTO_malloc_locked(int num, const char *file, int line)
+    __attribute__((deprecated));
+void CRYPTO_free_locked(void *ptr) __attribute__((deprecated));
+void *CRYPTO_malloc(int num, const char *file, int line)
+    __attribute__((deprecated));
+char *CRYPTO_strdup(const char *str, const char *file, int line)
+    __attribute__((deprecated));
+void CRYPTO_free(void *ptr) __attribute__((deprecated));
+void *CRYPTO_realloc(void *addr, int num, const char *file, int line)
+    __attribute__((deprecated));
 void *CRYPTO_realloc_clean(void *addr, int old_num, int num,
     const char *file, int line);
 void *CRYPTO_remalloc(void *addr, int num, const char *file, int line);
 
 void OPENSSL_cleanse(void *ptr, size_t len);
 
-void CRYPTO_set_mem_debug_options(long bits);
-long CRYPTO_get_mem_debug_options(void);
+void CRYPTO_set_mem_debug_options(long bits) __attribute__((deprecated));
+long CRYPTO_get_mem_debug_options(void) __attribute__((deprecated));
 
 #define CRYPTO_push_info(info) \
         CRYPTO_push_info_(info, __FILE__, __LINE__);
diff --git a/src/lib/libssl/src/crypto/crypto.h b/src/lib/libssl/src/crypto/crypto.h
index 00d3cc2aae..df0701a02d 100644
--- a/src/lib/libssl/src/crypto/crypto.h
+++ b/src/lib/libssl/src/crypto/crypto.h
@@ -471,20 +471,24 @@ void CRYPTO_get_mem_debug_functions(
     void (**r)(void *, void *, int, const char *, int, int),
     void (**f)(void *, int), void (**so)(long), long (**go)(void));
 
-void *CRYPTO_malloc_locked(int num, const char *file, int line);
-void CRYPTO_free_locked(void *ptr);
-void *CRYPTO_malloc(int num, const char *file, int line);
-char *CRYPTO_strdup(const char *str, const char *file, int line);
-void CRYPTO_free(void *ptr);
-void *CRYPTO_realloc(void *addr, int num, const char *file, int line);
+void *CRYPTO_malloc_locked(int num, const char *file, int line)
+    __attribute__((deprecated));
+void CRYPTO_free_locked(void *ptr) __attribute__((deprecated));
+void *CRYPTO_malloc(int num, const char *file, int line)
+    __attribute__((deprecated));
+char *CRYPTO_strdup(const char *str, const char *file, int line)
+    __attribute__((deprecated));
+void CRYPTO_free(void *ptr) __attribute__((deprecated));
+void *CRYPTO_realloc(void *addr, int num, const char *file, int line)
+    __attribute__((deprecated));
 void *CRYPTO_realloc_clean(void *addr, int old_num, int num,
     const char *file, int line);
 void *CRYPTO_remalloc(void *addr, int num, const char *file, int line);
 
 void OPENSSL_cleanse(void *ptr, size_t len);
 
-void CRYPTO_set_mem_debug_options(long bits);
-long CRYPTO_get_mem_debug_options(void);
+void CRYPTO_set_mem_debug_options(long bits) __attribute__((deprecated));
+long CRYPTO_get_mem_debug_options(void) __attribute__((deprecated));
 
 #define CRYPTO_push_info(info) \
         CRYPTO_push_info_(info, __FILE__, __LINE__);
-- 
cgit v1.2.3-55-g6feb