From: Rich Salz <rsalz@openssl.org>
Date: Fri, 3 Mar 2017 00:16:57 +0000 (-0500)
Subject: sh_malloc & sh_free prototype change to match POSIX
X-Git-Tag: OpenSSL_1_1_1-pre1~2125
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=332dc4fa5e4d7c0d94c4b68576f3872fd465ba8a;p=oweals%2Fopenssl.git

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)
---

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;