summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2014-05-23 03:20:12 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2014-05-23 03:20:12 +0000
commit92590219e7e47fe0b19a949372a5f7c1215a2160 (patch)
tree060469135f3458944161bad2dfe0fc07724ca996
parent3444caef08d67ea08ab605be95c8cda712263e18 (diff)
don't deprecate until at least the base src tree is clean.
-rw-r--r--lib/libcrypto/crypto.h20
1 files changed, 8 insertions, 12 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__);