diff options
| author | Ben Laurie <ben@openssl.org> | 2002-11-13 15:43:43 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2002-11-13 15:43:43 +0000 |
| commit | 54a656ef081f72a740c550ebd8099b40b8b5cde0 (patch) | |
| tree | 9b3638b56848c7f0648b84cfa7ad056116b37a1b /crypto/crypto.h | |
| parent | 8f797f14b8ff7d3d5cb04443284259a0c94860b3 (diff) | |
| download | openssl-54a656ef081f72a740c550ebd8099b40b8b5cde0.tar.gz | |
Security fixes brought forward from 0.9.7.
Diffstat (limited to 'crypto/crypto.h')
| -rw-r--r-- | crypto/crypto.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/crypto.h b/crypto/crypto.h index f87262f517..d6cb6f3cd5 100644 --- a/crypto/crypto.h +++ b/crypto/crypto.h @@ -343,6 +343,8 @@ int CRYPTO_is_mem_check_on(void); #define OPENSSL_malloc(num) CRYPTO_malloc((int)num,__FILE__,__LINE__) #define OPENSSL_realloc(addr,num) \ CRYPTO_realloc((char *)addr,(int)num,__FILE__,__LINE__) +#define OPENSSL_realloc_clean(addr,old_num,num) \ + CRYPTO_realloc_clean(addr,old_num,num,__FILE__,__LINE__) #define OPENSSL_remalloc(addr,num) \ CRYPTO_remalloc((char **)addr,(int)num,__FILE__,__LINE__) #define OPENSSL_freeFunc CRYPTO_free @@ -445,6 +447,8 @@ void CRYPTO_free_locked(void *); void *CRYPTO_malloc(int num, const char *file, int line); void CRYPTO_free(void *); 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 CRYPTO_set_mem_debug_options(long bits); @@ -487,7 +491,6 @@ void CRYPTO_mem_leaks(struct bio_st *bio); typedef void *CRYPTO_MEM_LEAK_CB(unsigned long, const char *, int, int, void *); void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb); - /* BEGIN ERROR CODES */ /* The following lines are auto generated by the script mkerr.pl. Any changes * made after this point may be overwritten when the script is next run. |