From ee92f38f88552102822256845d3b6b06e78001fc Mon Sep 17 00:00:00 2001
From: Daniel Pouzzner <douzzer@wolfssl.com>
Date: Fri, 11 Oct 2024 13:04:26 -0500
Subject: [PATCH] Revert "fix unused variables"

This reverts commit 06195a2e2a703966a36589673f4aa108c53bf5c1.
---
 wolfcrypt/src/aes.c     |  5 -----
 wolfcrypt/src/ed25519.c |  7 ++-----
 wolfcrypt/src/hash.c    | 10 ++--------
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/wolfcrypt/src/aes.c b/wolfcrypt/src/aes.c
index 2762f8571..ed31f53dd 100644
--- a/wolfcrypt/src/aes.c
+++ b/wolfcrypt/src/aes.c
@@ -11451,18 +11451,14 @@ int wc_AesInit_Label(Aes* aes, const char* label, void* heap, int devId)
 void wc_AesFree(Aes* aes)
 {
     void* heap;
-#ifndef WOLFSSL_NO_MALLOC
     byte isAllocated;
-#endif
 
     if (aes == NULL) {
         return;
     }
 
-#ifndef WOLFSSL_NO_MALLOC
     heap = aes->heap;
     isAllocated = aes->isAllocated;
-#endif
 
 #ifdef WC_DEBUG_CIPHER_LIFECYCLE
     (void)wc_debug_CipherLifecycleFree(&aes->CipherLifecycleTag, heap, 1);
@@ -11536,7 +11532,6 @@ void wc_AesFree(Aes* aes)
         XFREE(aes, heap, DYNAMIC_TYPE_AES);
     }
 #endif
-    (void)heap;
 
 }
 
diff --git a/wolfcrypt/src/ed25519.c b/wolfcrypt/src/ed25519.c
index c9386f17f..5a06cb771 100644
--- a/wolfcrypt/src/ed25519.c
+++ b/wolfcrypt/src/ed25519.c
@@ -1026,16 +1026,13 @@ int wc_ed25519_init(ed25519_key* key)
 void wc_ed25519_free(ed25519_key* key)
 {
     void* heap;
-#ifndef WOLFSSL_NO_MALLOC
     byte isAllocated = 0;
-#endif
+
     if (key == NULL)
         return;
 
-#ifndef WOLFSSL_NO_MALLOC
     heap = key->heap;
     isAllocated = key->isAllocated;
-#endif
 
 #ifdef WOLFSSL_ED25519_PERSISTENT_SHA
     ed25519_hash_free(key, &key->sha);
@@ -1053,9 +1050,9 @@ void wc_ed25519_free(ed25519_key* key)
 #ifndef WOLFSSL_NO_MALLOC
     if (isAllocated) {
         XFREE(key, heap, DYNAMIC_TYPE_ED25519);
+        (void)heap;
     }
 #endif
-    (void)heap;
 
 }
 
diff --git a/wolfcrypt/src/hash.c b/wolfcrypt/src/hash.c
index d727171d8..fdffa6030 100644
--- a/wolfcrypt/src/hash.c
+++ b/wolfcrypt/src/hash.c
@@ -712,9 +712,7 @@ int wc_HashInit_ex(wc_HashAlg* hash, enum wc_HashType type, void* heap,
     if (hash == NULL)
         return BAD_FUNC_ARG;
 
-#ifndef WOLFSSL_NO_MALLOC
     hash->isAllocated = 0;
-#endif
     hash->type = type;
 
     switch (type) {
@@ -1046,13 +1044,11 @@ int wc_HashFree(wc_HashAlg* hash, enum wc_HashType type)
 {
     int ret = WC_NO_ERR_TRACE(HASH_TYPE_E); /* Default to hash type error */
     void* heap = NULL;
-#ifndef WOLFSSL_NO_MALLOC
     byte isAllocated = 0;
-#endif
+
     if (hash == NULL)
         return BAD_FUNC_ARG;
 
-
 #ifdef DEBUG_WOLFSSL
     if (hash->type != type) {
         WOLFSSL_MSG("Hash free type mismatch!");
@@ -1060,9 +1056,7 @@ int wc_HashFree(wc_HashAlg* hash, enum wc_HashType type)
     }
 #endif
 
-#ifndef WOLFSSL_NO_MALLOC
     isAllocated = hash->isAllocated;
-#endif
 
     switch (type) {
         case WC_HASH_TYPE_MD5:
@@ -1181,9 +1175,9 @@ int wc_HashFree(wc_HashAlg* hash, enum wc_HashType type)
 #ifndef WOLFSSL_NO_MALLOC
     if (isAllocated) {
         XFREE(hash, heap, DYNAMIC_TYPE_HASHES);
+        (void)heap;
     }
 #endif
-    (void)heap;
 
     return ret;
 }