diff options
| author | miod <> | 2014-06-01 11:16:08 +0000 |
|---|---|---|
| committer | miod <> | 2014-06-01 11:16:08 +0000 |
| commit | 0f28597bbd77529fe4af16629b17d22f18c076bb (patch) | |
| tree | 3063f7c813101801fb1c6e3429c0b29f0cea8b44 /src/lib/libcrypto/crypto.h | |
| parent | 18ef1425b569ea27254911a14222de8d26e365a9 (diff) | |
| download | openbsd-0f28597bbd77529fe4af16629b17d22f18c076bb.tar.gz openbsd-0f28597bbd77529fe4af16629b17d22f18c076bb.tar.bz2 openbsd-0f28597bbd77529fe4af16629b17d22f18c076bb.zip | |
Add a deprecated attribute to all CRYPTO_dbg_ functions.
ok deraadt@
Diffstat (limited to 'src/lib/libcrypto/crypto.h')
| -rw-r--r-- | src/lib/libcrypto/crypto.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h index e3cf3ec7a9..a88a5b9888 100644 --- a/src/lib/libcrypto/crypto.h +++ b/src/lib/libcrypto/crypto.h | |||
| @@ -345,11 +345,6 @@ int CRYPTO_is_mem_check_on(void); | |||
| 345 | #define MemCheck_start() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON) | 345 | #define MemCheck_start() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON) |
| 346 | #define MemCheck_stop() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF) | 346 | #define MemCheck_stop() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF) |
| 347 | 347 | ||
| 348 | /* for library-internal use */ | ||
| 349 | #define MemCheck_on() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE) | ||
| 350 | #define MemCheck_off() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE) | ||
| 351 | #define is_MemCheck_on() CRYPTO_is_mem_check_on() | ||
| 352 | |||
| 353 | #define OPENSSL_malloc(num) CRYPTO_malloc((int)num,__FILE__,__LINE__) | 348 | #define OPENSSL_malloc(num) CRYPTO_malloc((int)num,__FILE__,__LINE__) |
| 354 | #define OPENSSL_strdup(str) CRYPTO_strdup((str),__FILE__,__LINE__) | 349 | #define OPENSSL_strdup(str) CRYPTO_strdup((str),__FILE__,__LINE__) |
| 355 | #define OPENSSL_realloc(addr,num) \ | 350 | #define OPENSSL_realloc(addr,num) \ |
| @@ -499,9 +494,12 @@ int CRYPTO_remove_all_info(void); | |||
| 499 | * 0: called before the actual memory allocation has taken place | 494 | * 0: called before the actual memory allocation has taken place |
| 500 | * 1: called after the actual memory allocation has taken place | 495 | * 1: called after the actual memory allocation has taken place |
| 501 | */ | 496 | */ |
| 502 | void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line, int before_p); | 497 | void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line, int before_p) |
| 503 | void CRYPTO_dbg_realloc(void *addr1, void *addr2, int num, const char *file, int line, int before_p); | 498 | __attribute__ ((deprecated)); |
| 504 | void CRYPTO_dbg_free(void *addr, int before_p); | 499 | void CRYPTO_dbg_realloc(void *addr1, void *addr2, int num, const char *file, int line, int before_p) |
| 500 | __attribute__ ((deprecated)); | ||
| 501 | void CRYPTO_dbg_free(void *addr, int before_p) | ||
| 502 | __attribute__ ((deprecated)); | ||
| 505 | /* Tell the debugging code about options. By default, the following values | 503 | /* Tell the debugging code about options. By default, the following values |
| 506 | * apply: | 504 | * apply: |
| 507 | * | 505 | * |
| @@ -510,8 +508,10 @@ void CRYPTO_dbg_free(void *addr, int before_p); | |||
| 510 | * V_CRYPTO_MDEBUG_THREAD (2): Set the "Show Thread Number" option. | 508 | * V_CRYPTO_MDEBUG_THREAD (2): Set the "Show Thread Number" option. |
| 511 | * V_CRYPTO_MDEBUG_ALL (3): 1 + 2 | 509 | * V_CRYPTO_MDEBUG_ALL (3): 1 + 2 |
| 512 | */ | 510 | */ |
| 513 | void CRYPTO_dbg_set_options(long bits); | 511 | void CRYPTO_dbg_set_options(long bits) |
| 514 | long CRYPTO_dbg_get_options(void); | 512 | __attribute__ ((deprecated)); |
| 513 | long CRYPTO_dbg_get_options(void) | ||
| 514 | __attribute__ ((deprecated)); | ||
| 515 | 515 | ||
| 516 | 516 | ||
| 517 | void CRYPTO_mem_leaks_fp(FILE *); | 517 | void CRYPTO_mem_leaks_fp(FILE *); |
