From a78c6ba4eaf767235158ede26440adb16891b9c5 Mon Sep 17 00:00:00 2001 From: David Garske Date: Tue, 3 Apr 2018 12:31:24 -0700 Subject: [PATCH 1/2] 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; From 426335b68f08c7ec4b9ce7098c685d6c8910d397 Mon Sep 17 00:00:00 2001 From: David Garske Date: Thu, 5 Apr 2018 12:02:58 -0700 Subject: [PATCH 2/2] Found additional VS unused `heap` warnings. Replace tabs with 4-spaces. --- src/tls.c | 52 +++++++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/src/tls.c b/src/tls.c index 4bf3198fa..5b72f134a 100755 --- a/src/tls.c +++ b/src/tls.c @@ -919,6 +919,8 @@ static TLSX* TLSX_New(TLSX_Type type, void* data, void* heap) { TLSX* extension = (TLSX*)XMALLOC(sizeof(TLSX), heap, DYNAMIC_TYPE_TLSX); + (void)heap; + if (extension) { extension->type = type; extension->data = data; @@ -2886,6 +2888,8 @@ static int TLSX_SupportedCurve_New(SupportedCurve** curve, word16 name, if (curve == NULL) return BAD_FUNC_ARG; + (void)heap; + *curve = (SupportedCurve*)XMALLOC(sizeof(SupportedCurve), heap, DYNAMIC_TYPE_TLSX); if (*curve == NULL) @@ -2902,6 +2906,8 @@ static int TLSX_PointFormat_New(PointFormat** point, byte format, void* heap) if (point == NULL) return BAD_FUNC_ARG; + (void)heap; + *point = (PointFormat*)XMALLOC(sizeof(PointFormat), heap, DYNAMIC_TYPE_TLSX); if (*point == NULL) @@ -4393,7 +4399,7 @@ int TLSX_ValidateQSHScheme(TLSX** extensions, word16 theirs) { for (format = (QSHScheme*)extension->data; format; format = format->next) { if (format->name == theirs) { - WOLFSSL_MSG("Found Matching QSH Scheme"); + WOLFSSL_MSG("Found Matching QSH Scheme"); return 1; /* have QSH */ } } @@ -4437,33 +4443,33 @@ int TLSX_UseQSHScheme(TLSX** extensions, word16 name, byte* pKey, word16 pkeySz, /* if scheme is implemented than add */ if (TLSX_HaveQSHScheme(name)) { - if ((ret = TLSX_QSH_Append(&format, name, pKey, pkeySz)) != 0) - return ret; + if ((ret = TLSX_QSH_Append(&format, name, pKey, pkeySz)) != 0) + return ret; - if (!extension) { - if ((ret = TLSX_Push(extensions, TLSX_QUANTUM_SAFE_HYBRID, format, + if (!extension) { + if ((ret = TLSX_Push(extensions, TLSX_QUANTUM_SAFE_HYBRID, format, heap)) != 0) { - XFREE(format, 0, DYNAMIC_TYPE_TLSX); - return ret; - } - } - else { - /* push new QSH object to extension data. */ - format->next = (QSHScheme*)extension->data; - extension->data = (void*)format; + XFREE(format, 0, DYNAMIC_TYPE_TLSX); + return ret; + } + } + else { + /* push new QSH object to extension data. */ + format->next = (QSHScheme*)extension->data; + extension->data = (void*)format; - /* look for another format of the same name to remove (replacement) */ - do { - if (format->next && (format->next->name == name)) { - QSHScheme* next = format->next; + /* look for another format of the same name to remove (replacement) */ + do { + if (format->next && (format->next->name == name)) { + QSHScheme* next = format->next; - format->next = next->next; - XFREE(next, 0, DYNAMIC_TYPE_TLSX); + format->next = next->next; + XFREE(next, 0, DYNAMIC_TYPE_TLSX); - break; - } - } while ((format = format->next)); - } + break; + } + } while ((format = format->next)); + } } return WOLFSSL_SUCCESS; }