From a78c6ba4eaf767235158ede26440adb16891b9c5 Mon Sep 17 00:00:00 2001 From: David Garske Date: Tue, 3 Apr 2018 12:31:24 -0700 Subject: [PATCH] Fix for unused `heap` warnings. --- src/tls.c | 4 ++++ wolfcrypt/src/ecc.c | 2 ++ wolfcrypt/src/pwdbased.c | 2 ++ 3 files changed, 8 insertions(+) mode change 100644 => 100755 src/tls.c mode change 100644 => 100755 wolfcrypt/src/ecc.c mode change 100644 => 100755 wolfcrypt/src/pwdbased.c diff --git a/src/tls.c b/src/tls.c old mode 100644 new mode 100755 index e81ae0eb2..4bf3198fa --- a/src/tls.c +++ b/src/tls.c @@ -8917,6 +8917,7 @@ int TLSX_Parse(WOLFSSL* ssl, byte* input, word16 length, byte msgType, WOLFSSL_METHOD* method = (WOLFSSL_METHOD*) XMALLOC(sizeof(WOLFSSL_METHOD), heap, DYNAMIC_TYPE_METHOD); + (void)heap; if (method) InitSSL_Method(method, MakeTLSv1()); return method; @@ -8933,6 +8934,7 @@ int TLSX_Parse(WOLFSSL* ssl, byte* input, word16 length, byte msgType, WOLFSSL_METHOD* method = (WOLFSSL_METHOD*) XMALLOC(sizeof(WOLFSSL_METHOD), heap, DYNAMIC_TYPE_METHOD); + (void)heap; if (method) InitSSL_Method(method, MakeTLSv1_1()); return method; @@ -9034,6 +9036,7 @@ int TLSX_Parse(WOLFSSL* ssl, byte* input, word16 length, byte msgType, WOLFSSL_METHOD* method = (WOLFSSL_METHOD*) XMALLOC(sizeof(WOLFSSL_METHOD), heap, DYNAMIC_TYPE_METHOD); + (void)heap; if (method) { InitSSL_Method(method, MakeTLSv1()); method->side = WOLFSSL_SERVER_END; @@ -9052,6 +9055,7 @@ int TLSX_Parse(WOLFSSL* ssl, byte* input, word16 length, byte msgType, WOLFSSL_METHOD* method = (WOLFSSL_METHOD*) XMALLOC(sizeof(WOLFSSL_METHOD), heap, DYNAMIC_TYPE_METHOD); + (void)heap; if (method) { InitSSL_Method(method, MakeTLSv1_1()); method->side = WOLFSSL_SERVER_END; diff --git a/wolfcrypt/src/ecc.c b/wolfcrypt/src/ecc.c old mode 100644 new mode 100755 index 2f78d29a2..ec799c382 --- a/wolfcrypt/src/ecc.c +++ b/wolfcrypt/src/ecc.c @@ -2404,6 +2404,8 @@ ecc_point* wc_ecc_new_point_h(void* heap) { ecc_point* p; + (void)heap; + p = (ecc_point*)XMALLOC(sizeof(ecc_point), heap, DYNAMIC_TYPE_ECC); if (p == NULL) { return NULL; diff --git a/wolfcrypt/src/pwdbased.c b/wolfcrypt/src/pwdbased.c old mode 100644 new mode 100755 index c7e7f27cd..e5ded0e71 --- a/wolfcrypt/src/pwdbased.c +++ b/wolfcrypt/src/pwdbased.c @@ -459,6 +459,8 @@ int wc_PKCS12_PBKDF_ex(byte* output, const byte* passwd, int passLen, byte B[PBKDF_DIGEST_SIZE]; #endif + (void)heap; + if (!iterations) iterations = 1;