Revert "fix unused variables"

This reverts commit 06195a2e2a.
This commit is contained in:
Daniel Pouzzner
2024-10-11 13:04:26 -05:00
parent 2ca3e1100e
commit ee92f38f88
3 changed files with 4 additions and 18 deletions

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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;
}