summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/crypto.h20
-rw-r--r--src/lib/libssl/src/crypto/crypto.h20
2 files changed, 16 insertions, 24 deletions
diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h
index df0701a02d..00d3cc2aae 100644
--- a/src/lib/libcrypto/crypto.h
+++ b/src/lib/libcrypto/crypto.h
@@ -471,24 +471,20 @@ void CRYPTO_get_mem_debug_functions(
471 void (**r)(void *, void *, int, const char *, int, int), 471 void (**r)(void *, void *, int, const char *, int, int),
472 void (**f)(void *, int), void (**so)(long), long (**go)(void)); 472 void (**f)(void *, int), void (**so)(long), long (**go)(void));
473 473
474void *CRYPTO_malloc_locked(int num, const char *file, int line) 474void *CRYPTO_malloc_locked(int num, const char *file, int line);
475 __attribute__((deprecated)); 475void CRYPTO_free_locked(void *ptr);
476void CRYPTO_free_locked(void *ptr) __attribute__((deprecated)); 476void *CRYPTO_malloc(int num, const char *file, int line);
477void *CRYPTO_malloc(int num, const char *file, int line) 477char *CRYPTO_strdup(const char *str, const char *file, int line);
478 __attribute__((deprecated)); 478void CRYPTO_free(void *ptr);
479char *CRYPTO_strdup(const char *str, const char *file, int line) 479void *CRYPTO_realloc(void *addr, int num, const char *file, int line);
480 __attribute__((deprecated));
481void CRYPTO_free(void *ptr) __attribute__((deprecated));
482void *CRYPTO_realloc(void *addr, int num, const char *file, int line)
483 __attribute__((deprecated));
484void *CRYPTO_realloc_clean(void *addr, int old_num, int num, 480void *CRYPTO_realloc_clean(void *addr, int old_num, int num,
485 const char *file, int line); 481 const char *file, int line);
486void *CRYPTO_remalloc(void *addr, int num, const char *file, int line); 482void *CRYPTO_remalloc(void *addr, int num, const char *file, int line);
487 483
488void OPENSSL_cleanse(void *ptr, size_t len); 484void OPENSSL_cleanse(void *ptr, size_t len);
489 485
490void CRYPTO_set_mem_debug_options(long bits) __attribute__((deprecated)); 486void CRYPTO_set_mem_debug_options(long bits);
491long CRYPTO_get_mem_debug_options(void) __attribute__((deprecated)); 487long CRYPTO_get_mem_debug_options(void);
492 488
493#define CRYPTO_push_info(info) \ 489#define CRYPTO_push_info(info) \
494 CRYPTO_push_info_(info, __FILE__, __LINE__); 490 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 df0701a02d..00d3cc2aae 100644
--- a/src/lib/libssl/src/crypto/crypto.h
+++ b/src/lib/libssl/src/crypto/crypto.h
@@ -471,24 +471,20 @@ void CRYPTO_get_mem_debug_functions(
471 void (**r)(void *, void *, int, const char *, int, int), 471 void (**r)(void *, void *, int, const char *, int, int),
472 void (**f)(void *, int), void (**so)(long), long (**go)(void)); 472 void (**f)(void *, int), void (**so)(long), long (**go)(void));
473 473
474void *CRYPTO_malloc_locked(int num, const char *file, int line) 474void *CRYPTO_malloc_locked(int num, const char *file, int line);
475 __attribute__((deprecated)); 475void CRYPTO_free_locked(void *ptr);
476void CRYPTO_free_locked(void *ptr) __attribute__((deprecated)); 476void *CRYPTO_malloc(int num, const char *file, int line);
477void *CRYPTO_malloc(int num, const char *file, int line) 477char *CRYPTO_strdup(const char *str, const char *file, int line);
478 __attribute__((deprecated)); 478void CRYPTO_free(void *ptr);
479char *CRYPTO_strdup(const char *str, const char *file, int line) 479void *CRYPTO_realloc(void *addr, int num, const char *file, int line);
480 __attribute__((deprecated));
481void CRYPTO_free(void *ptr) __attribute__((deprecated));
482void *CRYPTO_realloc(void *addr, int num, const char *file, int line)
483 __attribute__((deprecated));
484void *CRYPTO_realloc_clean(void *addr, int old_num, int num, 480void *CRYPTO_realloc_clean(void *addr, int old_num, int num,
485 const char *file, int line); 481 const char *file, int line);
486void *CRYPTO_remalloc(void *addr, int num, const char *file, int line); 482void *CRYPTO_remalloc(void *addr, int num, const char *file, int line);
487 483
488void OPENSSL_cleanse(void *ptr, size_t len); 484void OPENSSL_cleanse(void *ptr, size_t len);
489 485
490void CRYPTO_set_mem_debug_options(long bits) __attribute__((deprecated)); 486void CRYPTO_set_mem_debug_options(long bits);
491long CRYPTO_get_mem_debug_options(void) __attribute__((deprecated)); 487long CRYPTO_get_mem_debug_options(void);
492 488
493#define CRYPTO_push_info(info) \ 489#define CRYPTO_push_info(info) \
494 CRYPTO_push_info_(info, __FILE__, __LINE__); 490 CRYPTO_push_info_(info, __FILE__, __LINE__);