[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  332dc4fa5e4d7c0d94c4b68576f3872fd465ba8a (commit)
      from  42f50fdf8aaff297742f0b541408a89e33e31c6e (commit)


- Log -----------------------------------------------------------------
commit 332dc4fa5e4d7c0d94c4b68576f3872fd465ba8a
Author: Rich Salz <rsalz at openssl.org>
Date:   Thu Mar 2 19:16:57 2017 -0500

    sh_malloc & sh_free prototype change to match POSIX
    
    CLA: trivial
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2823)

-----------------------------------------------------------------------

Summary of changes:
 crypto/mem_sec.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
index 4a3f2a8..93bff90 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;