diff options
author | Rich Salz <rsalz@openssl.org> | 2017-03-02 19:16:57 -0500 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2017-03-02 19:16:57 -0500 |
commit | 332dc4fa5e4d7c0d94c4b68576f3872fd465ba8a (patch) | |
tree | 191032846a05bb2234fabd49900d29360dd2c7ac /crypto/mem_sec.c | |
parent | 42f50fdf8aaff297742f0b541408a89e33e31c6e (diff) |
sh_malloc & sh_free prototype change to match POSIX
CLA: trivial
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2823)
Diffstat (limited to 'crypto/mem_sec.c')
-rw-r--r-- | crypto/mem_sec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c index 4a3f2a84a2..93bff90d8d 100644 --- a/crypto/mem_sec.c +++ b/crypto/mem_sec.c @@ -52,8 +52,8 @@ static CRYPTO_RWLOCK *sec_malloc_lock = NULL; * These are the functions that must be implemented by a secure heap (sh). */ static int sh_init(size_t size, int minsize); -static char *sh_malloc(size_t size); -static void sh_free(char *ptr); +static void *sh_malloc(size_t size); +static void sh_free(void *ptr); static void sh_done(void); static size_t sh_actual_size(char *ptr); static int sh_allocated(const char *ptr); @@ -476,7 +476,7 @@ static char *sh_find_my_buddy(char *ptr, int list) return chunk; } -static char *sh_malloc(size_t size) +static void *sh_malloc(size_t size) { ossl_ssize_t list, slist; size_t i; @@ -535,10 +535,10 @@ static char *sh_malloc(size_t size) return chunk; } -static void sh_free(char *ptr) +static void sh_free(void *ptr) { size_t list; - char *buddy; + void *buddy; if (ptr == NULL) return; |