diff options
| author |   tedu <tedu@openbsd.org> | 2014-05-23 03:20:11 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2014-05-23 03:20:11 +0000 |
| commit | 9c37415ae5df6ce225786c22182c0a3df0c8e399 (patch) | |
| tree | 3c2febbfefceeb8968cbb7d4b59c9e17b9536368 | |
| parent | Mark the malloc wrapper functions as deprecated so warnings will (diff) | |
| download | wireguard-openbsd-9c37415ae5df6ce225786c22182c0a3df0c8e399.tar.xz wireguard-openbsd-9c37415ae5df6ce225786c22182c0a3df0c8e399.zip | |
don't deprecate until at least the base src tree is clean.
| -rw-r--r-- | lib/libcrypto/crypto.h | 20 | ||||
| -rw-r--r-- | 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__); |