diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/crypto.h | 20 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/crypto.h | 20 |
2 files changed, 24 insertions, 16 deletions
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( | |||
| 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 | ||
| 474 | void *CRYPTO_malloc_locked(int num, const char *file, int line); | 474 | void *CRYPTO_malloc_locked(int num, const char *file, int line) |
| 475 | void CRYPTO_free_locked(void *ptr); | 475 | __attribute__((deprecated)); |
| 476 | void *CRYPTO_malloc(int num, const char *file, int line); | 476 | void CRYPTO_free_locked(void *ptr) __attribute__((deprecated)); |
| 477 | char *CRYPTO_strdup(const char *str, const char *file, int line); | 477 | void *CRYPTO_malloc(int num, const char *file, int line) |
| 478 | void CRYPTO_free(void *ptr); | 478 | __attribute__((deprecated)); |
| 479 | void *CRYPTO_realloc(void *addr, int num, const char *file, int line); | 479 | char *CRYPTO_strdup(const char *str, const char *file, int line) |
| 480 | __attribute__((deprecated)); | ||
| 481 | void CRYPTO_free(void *ptr) __attribute__((deprecated)); | ||
| 482 | void *CRYPTO_realloc(void *addr, int num, const char *file, int line) | ||
| 483 | __attribute__((deprecated)); | ||
| 480 | void *CRYPTO_realloc_clean(void *addr, int old_num, int num, | 484 | void *CRYPTO_realloc_clean(void *addr, int old_num, int num, |
| 481 | const char *file, int line); | 485 | const char *file, int line); |
| 482 | void *CRYPTO_remalloc(void *addr, int num, const char *file, int line); | 486 | void *CRYPTO_remalloc(void *addr, int num, const char *file, int line); |
| 483 | 487 | ||
| 484 | void OPENSSL_cleanse(void *ptr, size_t len); | 488 | void OPENSSL_cleanse(void *ptr, size_t len); |
| 485 | 489 | ||
| 486 | void CRYPTO_set_mem_debug_options(long bits); | 490 | void CRYPTO_set_mem_debug_options(long bits) __attribute__((deprecated)); |
| 487 | long CRYPTO_get_mem_debug_options(void); | 491 | long CRYPTO_get_mem_debug_options(void) __attribute__((deprecated)); |
| 488 | 492 | ||
| 489 | #define CRYPTO_push_info(info) \ | 493 | #define CRYPTO_push_info(info) \ |
| 490 | CRYPTO_push_info_(info, __FILE__, __LINE__); | 494 | 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( | |||
| 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 | ||
| 474 | void *CRYPTO_malloc_locked(int num, const char *file, int line); | 474 | void *CRYPTO_malloc_locked(int num, const char *file, int line) |
| 475 | void CRYPTO_free_locked(void *ptr); | 475 | __attribute__((deprecated)); |
| 476 | void *CRYPTO_malloc(int num, const char *file, int line); | 476 | void CRYPTO_free_locked(void *ptr) __attribute__((deprecated)); |
| 477 | char *CRYPTO_strdup(const char *str, const char *file, int line); | 477 | void *CRYPTO_malloc(int num, const char *file, int line) |
| 478 | void CRYPTO_free(void *ptr); | 478 | __attribute__((deprecated)); |
| 479 | void *CRYPTO_realloc(void *addr, int num, const char *file, int line); | 479 | char *CRYPTO_strdup(const char *str, const char *file, int line) |
| 480 | __attribute__((deprecated)); | ||
| 481 | void CRYPTO_free(void *ptr) __attribute__((deprecated)); | ||
| 482 | void *CRYPTO_realloc(void *addr, int num, const char *file, int line) | ||
| 483 | __attribute__((deprecated)); | ||
| 480 | void *CRYPTO_realloc_clean(void *addr, int old_num, int num, | 484 | void *CRYPTO_realloc_clean(void *addr, int old_num, int num, |
| 481 | const char *file, int line); | 485 | const char *file, int line); |
| 482 | void *CRYPTO_remalloc(void *addr, int num, const char *file, int line); | 486 | void *CRYPTO_remalloc(void *addr, int num, const char *file, int line); |
| 483 | 487 | ||
| 484 | void OPENSSL_cleanse(void *ptr, size_t len); | 488 | void OPENSSL_cleanse(void *ptr, size_t len); |
| 485 | 489 | ||
| 486 | void CRYPTO_set_mem_debug_options(long bits); | 490 | void CRYPTO_set_mem_debug_options(long bits) __attribute__((deprecated)); |
| 487 | long CRYPTO_get_mem_debug_options(void); | 491 | long CRYPTO_get_mem_debug_options(void) __attribute__((deprecated)); |
| 488 | 492 | ||
| 489 | #define CRYPTO_push_info(info) \ | 493 | #define CRYPTO_push_info(info) \ |
| 490 | CRYPTO_push_info_(info, __FILE__, __LINE__); | 494 | CRYPTO_push_info_(info, __FILE__, __LINE__); |
