From 9c37415ae5df6ce225786c22182c0a3df0c8e399 Mon Sep 17 00:00:00 2001 From: tedu Date: Fri, 23 May 2014 03:20:11 +0000 Subject: [PATCH] don't deprecate until at least the base src tree is clean. --- lib/libcrypto/crypto.h | 20 ++++++++------------ lib/libssl/src/crypto/crypto.h | 20 ++++++++------------ 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/lib/libcrypto/crypto.h b/lib/libcrypto/crypto.h index df0701a02dc..00d3cc2aaed 100644 --- a/lib/libcrypto/crypto.h +++ b/lib/libcrypto/crypto.h @@ -471,24 +471,20 @@ 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) - __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_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_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) __attribute__((deprecated)); -long CRYPTO_get_mem_debug_options(void) __attribute__((deprecated)); +void CRYPTO_set_mem_debug_options(long bits); +long CRYPTO_get_mem_debug_options(void); #define CRYPTO_push_info(info) \ CRYPTO_push_info_(info, __FILE__, __LINE__); diff --git a/lib/libssl/src/crypto/crypto.h b/lib/libssl/src/crypto/crypto.h index df0701a02dc..00d3cc2aaed 100644 --- a/lib/libssl/src/crypto/crypto.h +++ b/lib/libssl/src/crypto/crypto.h @@ -471,24 +471,20 @@ 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) - __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_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_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) __attribute__((deprecated)); -long CRYPTO_get_mem_debug_options(void) __attribute__((deprecated)); +void CRYPTO_set_mem_debug_options(long bits); +long CRYPTO_get_mem_debug_options(void); #define CRYPTO_push_info(info) \ CRYPTO_push_info_(info, __FILE__, __LINE__); -- 2.20.1