From bb5de34e5c087807ceba3c6610493b80d2947e2e Mon Sep 17 00:00:00 2001
From: Jacob Barthelmeh <jacob@wolfssl.com>
Date: Tue, 1 Dec 2015 09:24:44 -0700
Subject: [PATCH] cast type on XMALLOC with ntru

---
 src/internal.c | 17 ++++++++++-------
 src/tls.c      | 18 +++++++++++-------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/internal.c b/src/internal.c
index a9b98507c..1e3cd3aba 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -278,13 +278,14 @@ static word32 GetEntropy(unsigned char* out, word32 num_bytes)
     int ret = 0;
 
     if (rng == NULL) {
-        if ((rng = XMALLOC(sizeof(WC_RNG), 0, DYNAMIC_TYPE_TLSX)) == NULL)
+        if ((rng = (WC_RNG*)XMALLOC(sizeof(WC_RNG), 0,
+                                                    DYNAMIC_TYPE_TLSX)) == NULL)
             return DRBG_OUT_OF_MEMORY;
         wc_InitRng(rng);
     }
 
     if (rngMutex == NULL) {
-        if ((rngMutex = XMALLOC(sizeof(wolfSSL_Mutex), 0,
+        if ((rngMutex = (wolfSSL_Mutex*)XMALLOC(sizeof(wolfSSL_Mutex), 0,
                         DYNAMIC_TYPE_TLSX)) == NULL)
             return DRBG_OUT_OF_MEMORY;
         InitMutex(rngMutex);
@@ -11460,8 +11461,8 @@ int QSH_Init(WOLFSSL* ssl)
         return 0;
 
     /* malloc memory for holding generated secret information */
-    if ((ssl->QSH_secret =
-             XMALLOC(sizeof(QSHSecret), NULL, DYNAMIC_TYPE_TMP_BUFFER)) == NULL)
+    if ((ssl->QSH_secret = (QSHSecret*)XMALLOC(sizeof(QSHSecret), NULL,
+                    DYNAMIC_TYPE_TMP_BUFFER)) == NULL)
         return MEMORY_E;
 
     ssl->QSH_secret->CliSi = (buffer*)XMALLOC(sizeof(buffer), NULL,
@@ -11623,7 +11624,7 @@ static int QSH_GenerateSerCliSecret(WOLFSSL* ssl, byte isServer)
         buf = ssl->QSH_secret->CliSi;
     }
     buf->length = sz;
-    buf->buffer = XMALLOC(sz, buf->buffer, DYNAMIC_TYPE_TMP_BUFFER);
+    buf->buffer = (byte*)XMALLOC(sz, buf->buffer, DYNAMIC_TYPE_TMP_BUFFER);
     if (buf->buffer == NULL) {
         WOLFSSL_ERROR(MEMORY_E);
     }
@@ -11632,7 +11633,8 @@ static int QSH_GenerateSerCliSecret(WOLFSSL* ssl, byte isServer)
     sz = 0;
     current = ssl->peerQSHKey;
     while (current) {
-        schm = XMALLOC(sizeof(QSHScheme), NULL, DYNAMIC_TYPE_TMP_BUFFER);
+        schm = (QSHScheme*)XMALLOC(sizeof(QSHScheme), NULL,
+                                                       DYNAMIC_TYPE_TMP_BUFFER);
         if (schm == NULL)
             return MEMORY_E;
 
@@ -11651,7 +11653,8 @@ static int QSH_GenerateSerCliSecret(WOLFSSL* ssl, byte isServer)
 
         tmpSz = QSH_MaxSecret(current);
 
-        if ((schm->PK = XMALLOC(tmpSz, 0, DYNAMIC_TYPE_TMP_BUFFER)) == NULL)
+        if ((schm->PK = (byte*)XMALLOC(tmpSz, 0,
+                                              DYNAMIC_TYPE_TMP_BUFFER)) == NULL)
             return -1;
 
         /* store info for writing extension */
diff --git a/src/tls.c b/src/tls.c
index 619f96856..8cef8597b 100644
--- a/src/tls.c
+++ b/src/tls.c
@@ -2752,7 +2752,8 @@ static int TLSX_QSH_Append(QSHScheme** list, word16 name, byte* pub,
     if (list == NULL)
         return BAD_FUNC_ARG;
 
-    if ((temp = XMALLOC(sizeof(QSHScheme), NULL, DYNAMIC_TYPE_TLSX)) == NULL)
+    if ((temp = (QSHScheme*)XMALLOC(sizeof(QSHScheme), NULL,
+                                                    DYNAMIC_TYPE_TLSX)) == NULL)
         return MEMORY_E;
 
     temp->name  = name;
@@ -3028,7 +3029,8 @@ static int TLSX_QSH_Parse(WOLFSSL* ssl, byte* input, word16 length,
     while ((offset_len < offset_pk) && numKeys) {
         QSHKey * temp;
 
-        if ((temp = XMALLOC(sizeof(QSHKey), NULL, DYNAMIC_TYPE_TLSX)) == NULL)
+        if ((temp = (QSHKey*)XMALLOC(sizeof(QSHKey), NULL,
+                                                    DYNAMIC_TYPE_TLSX)) == NULL)
             return MEMORY_E;
 
         /* initialize */
@@ -3544,13 +3546,14 @@ static word32 GetEntropy(unsigned char* out, word32 num_bytes)
     int ret = 0;
 
     if (rng == NULL) {
-        if ((rng = XMALLOC(sizeof(WC_RNG), NULL, DYNAMIC_TYPE_TLSX)) == NULL)
+        if ((rng = (WC_RNG*)XMALLOC(sizeof(WC_RNG), NULL,
+                                                    DYNAMIC_TYPE_TLSX)) == NULL)
             return DRBG_OUT_OF_MEMORY;
         wc_InitRng(rng);
     }
 
     if (rngMutex == NULL) {
-        if ((rngMutex = XMALLOC(sizeof(wolfSSL_Mutex), NULL,
+        if ((rngMutex = (wolfSSL_Mutex*)XMALLOC(sizeof(wolfSSL_Mutex), NULL,
                                                     DYNAMIC_TYPE_TLSX)) == NULL)
             return DRBG_OUT_OF_MEMORY;
         InitMutex(rngMutex);
@@ -3670,15 +3673,16 @@ int TLSX_CreateNtruKey(WOLFSSL* ssl, int type)
         return ret;
     }
 
-    if ((temp = XMALLOC(sizeof(QSHKey), NULL, DYNAMIC_TYPE_TLSX)) == NULL)
+    if ((temp = (QSHKey*)XMALLOC(sizeof(QSHKey), NULL,
+                                                    DYNAMIC_TYPE_TLSX)) == NULL)
         return MEMORY_E;
     temp->name = type;
     temp->pub.length = public_key_len;
-    temp->pub.buffer = XMALLOC(public_key_len, public_key,
+    temp->pub.buffer = (byte*)XMALLOC(public_key_len, public_key,
                                 DYNAMIC_TYPE_PUBLIC_KEY);
     XMEMCPY(temp->pub.buffer, public_key, public_key_len);
     temp->pri.length = private_key_len;
-    temp->pri.buffer = XMALLOC(private_key_len, private_key,
+    temp->pri.buffer = (byte*)XMALLOC(private_key_len, private_key,
                                 DYNAMIC_TYPE_ARRAYS);
     XMEMCPY(temp->pri.buffer, private_key, private_key_len);
     temp->next = NULL;