Skip to content

Commit cc65c3e

Browse files
JacobBarthelmehJacobBarthelmeh
authored
Merge pull request #7009 from douzzer/20231128-misc-fixes
20231128-misc-fixes
2 parents 6125e59 + cb381a2 commit cc65c3e

9 files changed

Lines changed: 85 additions & 79 deletions

File tree

‎src/quic.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1056,7 +1056,7 @@ size_t wolfSSL_quic_get_aead_tag_len(const WOLFSSL_EVP_CIPHER* aead_cipher)
10561056
}
10571057

10581058
#ifdef WOLFSSL_SMALL_STACK
1059-
XFREE(ctx, NULL, DYNAMIC_TYPE_TMP_BUF);
1059+
XFREE(ctx, NULL, DYNAMIC_TYPE_TMP_BUFFER);
10601060
#endif
10611061

10621062
return ret;

‎src/ssl.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30149,7 +30149,7 @@ static int set_curves_list(WOLFSSL* ssl, WOLFSSL_CTX *ctx, const char* names)
3014930149
char name[MAX_CURVE_NAME_SZ];
3015030150
byte groups_len = 0;
3015130151
#ifdef WOLFSSL_SMALL_STACK
30152-
void *heap = ssl? ssl->heap : ctx ? ctx->heap : NULL; (void)heap;
30152+
void *heap = ssl? ssl->heap : ctx ? ctx->heap : NULL;
3015330153
int *groups;
3015430154
#else
3015530155
int groups[WOLFSSL_MAX_GROUP_COUNT];

‎src/tls.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8386,7 +8386,7 @@ static int TLSX_KeyShare_ProcessPqc(WOLFSSL* ssl, KeyShareEntry* keyShareEntry)
83868386
XMEMCPY(ssl->arrays->preMasterSecret, keyShareEntry->ke,
83878387
keyShareEntry->keLen);
83888388
ssl->arrays->preMasterSz = keyShareEntry->keLen;
8389-
XFREE(keyShareEntry->ke, sl->heap, DYNAMIC_TYPE_SECRET)
8389+
XFREE(keyShareEntry->ke, ssl->heap, DYNAMIC_TYPE_SECRET)
83908390
keyShareEntry->ke = NULL;
83918391
keyShareEntry->keLen = 0;
83928392
return 0;

‎wolfcrypt/src/aes.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3885,6 +3885,8 @@ static WARN_UNUSED_RESULT int wc_AesDecrypt(
38853885
* and we need both HW and SW. */
38863886
#ifdef NEED_SOFTWARE_AES_SETKEY
38873887

3888+
#ifdef NEED_AES_TABLES
3889+
38883890
#ifndef WC_AES_BITSLICED
38893891
/* Set the AES key and expand.
38903892
*
@@ -4125,6 +4127,8 @@ static void AesSetKey_C(Aes* aes, const byte* key, word32 keySz, int dir)
41254127
}
41264128
#endif /* WC_AES_BITSLICED */
41274129

4130+
#endif /* NEED_AES_TABLES */
4131+
41284132
/* Software AES - SetKey */
41294133
static WARN_UNUSED_RESULT int wc_AesSetKeyLocal(
41304134
Aes* aes, const byte* userKey, word32 keylen, const byte* iv, int dir,

‎wolfcrypt/src/ecc.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13066,7 +13066,7 @@ int wc_ecc_mulmod_ex(const mp_int* k, ecc_point *G, ecc_point *R, mp_int* a,
1306613066
#ifndef WOLFSSL_SP_NO_256
1306713067
if (mp_count_bits(modulus) == 256) {
1306813068
int ret;
13069-
SAVE_VECTOR_REGISTERS(return _svr_ret);
13069+
SAVE_VECTOR_REGISTERS(return _svr_ret;);
1307013070
ret = sp_ecc_mulmod_256(k, G, R, map, heap);
1307113071
RESTORE_VECTOR_REGISTERS();
1307213072
return ret;
@@ -13075,7 +13075,7 @@ int wc_ecc_mulmod_ex(const mp_int* k, ecc_point *G, ecc_point *R, mp_int* a,
1307513075
#ifdef WOLFSSL_SP_384
1307613076
if (mp_count_bits(modulus) == 384) {
1307713077
int ret;
13078-
SAVE_VECTOR_REGISTERS(return _svr_ret);
13078+
SAVE_VECTOR_REGISTERS(return _svr_ret;);
1307913079
ret = sp_ecc_mulmod_384(k, G, R, map, heap);
1308013080
RESTORE_VECTOR_REGISTERS();
1308113081
return ret;
@@ -13084,7 +13084,7 @@ int wc_ecc_mulmod_ex(const mp_int* k, ecc_point *G, ecc_point *R, mp_int* a,
1308413084
#ifdef WOLFSSL_SP_521
1308513085
if (mp_count_bits(modulus) == 521) {
1308613086
int ret;
13087-
SAVE_VECTOR_REGISTERS(return _svr_ret);
13087+
SAVE_VECTOR_REGISTERS(return _svr_ret;);
1308813088
ret = sp_ecc_mulmod_521(k, G, R, map, heap);
1308913089
RESTORE_VECTOR_REGISTERS();
1309013090
return ret;
@@ -13235,7 +13235,7 @@ int wc_ecc_mulmod_ex2(const mp_int* k, ecc_point *G, ecc_point *R, mp_int* a,
1323513235
#if defined(WOLFSSL_SM2) && defined(WOLFSSL_SP_SM2)
1323613236
if ((mp_count_bits(modulus) == 256) && (!mp_is_bit_set(modulus, 224))) {
1323713237
int ret;
13238-
SAVE_VECTOR_REGISTERS(return _svr_ret);
13238+
SAVE_VECTOR_REGISTERS(return _svr_ret;);
1323913239
ret = sp_ecc_mulmod_sm2_256(k, G, R, map, heap);
1324013240
RESTORE_VECTOR_REGISTERS();
1324113241
return ret;
@@ -13244,7 +13244,7 @@ int wc_ecc_mulmod_ex2(const mp_int* k, ecc_point *G, ecc_point *R, mp_int* a,
1324413244
#ifndef WOLFSSL_SP_NO_256
1324513245
if (mp_count_bits(modulus) == 256) {
1324613246
int ret;
13247-
SAVE_VECTOR_REGISTERS(return _svr_ret);
13247+
SAVE_VECTOR_REGISTERS(return _svr_ret;);
1324813248
ret = sp_ecc_mulmod_256(k, G, R, map, heap);
1324913249
RESTORE_VECTOR_REGISTERS();
1325013250
return ret;
@@ -13253,7 +13253,7 @@ int wc_ecc_mulmod_ex2(const mp_int* k, ecc_point *G, ecc_point *R, mp_int* a,
1325313253
#ifdef WOLFSSL_SP_384
1325413254
if (mp_count_bits(modulus) == 384) {
1325513255
int ret;
13256-
SAVE_VECTOR_REGISTERS(return _svr_ret);
13256+
SAVE_VECTOR_REGISTERS(return _svr_ret;);
1325713257
ret = sp_ecc_mulmod_384(k, G, R, map, heap);
1325813258
RESTORE_VECTOR_REGISTERS();
1325913259
return ret;
@@ -13262,7 +13262,7 @@ int wc_ecc_mulmod_ex2(const mp_int* k, ecc_point *G, ecc_point *R, mp_int* a,
1326213262
#ifdef WOLFSSL_SP_521
1326313263
if (mp_count_bits(modulus) == 521) {
1326413264
int ret;
13265-
SAVE_VECTOR_REGISTERS(return _svr_ret);
13265+
SAVE_VECTOR_REGISTERS(return _svr_ret;);
1326613266
ret = sp_ecc_mulmod_521(k, G, R, map, heap);
1326713267
RESTORE_VECTOR_REGISTERS();
1326813268
return ret;

‎wolfcrypt/src/sp_int.c‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7687,7 +7687,7 @@ static void sp_clamp_ct(sp_int* a)
76877687
unsigned int used = a->used;
76887688
unsigned int mask = (unsigned int)-1;
76897689

7690-
for (i = a->used-1; i >= 0; i--) {
7690+
for (i = (int)a->used - 1; i >= 0; i--) {
76917691
used -= ((unsigned int)(a->dp[i] == 0)) & mask;
76927692
mask &= (unsigned int)0 - (a->dp[i] == 0);
76937693
}
@@ -17072,7 +17072,9 @@ static int _sp_mont_red(sp_int* a, const sp_int* m, sp_int_digit mp, int ct)
1707217072
}
1707317073
else {
1707417074
for (i = 0; i < m->used * 2; i++) {
17075-
a->dp[i] &= (sp_int_digit)(sp_int_sdigit)ctMaskIntGTE(a->used-1, i);
17075+
a->dp[i] &=
17076+
(sp_int_digit)
17077+
(sp_int_sdigit)ctMaskIntGTE((int)(a->used-1), (int)i);
1707617078
}
1707717079
}
1707817080

@@ -17195,7 +17197,9 @@ static int _sp_mont_red(sp_int* a, const sp_int* m, sp_int_digit mp, int ct)
1719517197
}
1719617198
else {
1719717199
for (i = 0; i < m->used * 2; i++) {
17198-
a->dp[i] &= (sp_int_digit)(sp_int_sdigit)ctMaskIntGTE(a->used-1, i);
17200+
a->dp[i] &=
17201+
(sp_int_digit)
17202+
(sp_int_sdigit)ctMaskIntGTE((int)(a->used-1), (int)i);
1719917203
}
1720017204
}
1720117205

‎wolfcrypt/test/test.c‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20683,6 +20683,14 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t dsa_test(void)
2068320683
if (answer != 1)
2068420684
ERROR_OUT(WC_TEST_RET_ENC_NC, out);
2068520685

20686+
wc_FreeDsaKey(key);
20687+
key_inited = 0;
20688+
20689+
ret = wc_InitDsaKey_h(key, NULL);
20690+
if (ret != 0)
20691+
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), out);
20692+
key_inited = 1;
20693+
2068620694
#ifdef WOLFSSL_KEY_GEN
2068720695
{
2068820696
int derSz = 0;
@@ -20727,16 +20735,6 @@ WOLFSSL_TEST_SUBROUTINE wc_test_ret_t dsa_test(void)
2072720735

2072820736
out:
2072920737

20730-
#if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC)
20731-
if (key) {
20732-
#endif
20733-
ret = wc_InitDsaKey_h(key, NULL);
20734-
if (ret != 0)
20735-
ret = WC_TEST_RET_ENC_EC(ret);
20736-
#if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC)
20737-
}
20738-
#endif
20739-
2074020738
#ifdef WOLFSSL_KEY_GEN
2074120739
if (der)
2074220740
XFREE(der, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);

‎wolfssl/wolfcrypt/settings.h‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -636,8 +636,8 @@
636636
#ifdef WOLFSSL_PICOTCP_DEMO
637637
#define WOLFSSL_STM32
638638
#define TFM_TIMING_RESISTANT
639-
#define XMALLOC(s, h, type) PICO_ZALLOC((s))
640-
#define XFREE(p, h, type) PICO_FREE((p))
639+
#define XMALLOC(s, h, type) ((void)(h), (void)(type), PICO_ZALLOC((s)))
640+
#define XFREE(p, h, type) ((void)(h), (void)(type), PICO_FREE((p)))
641641
#define SINGLE_THREADED
642642
#define NO_WRITEV
643643
#define WOLFSSL_USER_IO
@@ -824,9 +824,9 @@ extern void *uITRON4_malloc(size_t sz) ;
824824
extern void *uITRON4_realloc(void *p, size_t sz) ;
825825
extern void uITRON4_free(void *p) ;
826826

827-
#define XMALLOC(sz, heap, type) uITRON4_malloc(sz)
828-
#define XREALLOC(p, sz, heap, type) uITRON4_realloc(p, sz)
829-
#define XFREE(p, heap, type) uITRON4_free(p)
827+
#define XMALLOC(sz, heap, type) ((void)(heap), (void)(type), uITRON4_malloc(sz))
828+
#define XREALLOC(p, sz, heap, type) ((void)(heap), (void)(type), uITRON4_realloc(p, sz))
829+
#define XFREE(p, heap, type) ((void)(heap), (void)(type), uITRON4_free(p))
830830
#endif
831831

832832
#if defined(WOLFSSL_uTKERNEL2)
@@ -836,9 +836,9 @@ extern void uITRON4_free(void *p) ;
836836
void* uTKernel_malloc(unsigned int sz);
837837
void* uTKernel_realloc(void *p, unsigned int sz);
838838
void uTKernel_free(void *p);
839-
#define XMALLOC(s, h, type) uTKernel_malloc((s))
840-
#define XREALLOC(p, n, h, t) uTKernel_realloc((p), (n))
841-
#define XFREE(p, h, type) uTKernel_free((p))
839+
#define XMALLOC(s, h, type) ((void)(h), (void)(type), uTKernel_malloc((s)))
840+
#define XREALLOC(p, n, h, t) ((void)(h), (void)(t), uTKernel_realloc((p), (n)))
841+
#define XFREE(p, h, type) ((void)(h), (void)(type), uTKernel_free((p)))
842842
#endif
843843

844844
#ifndef NO_STDIO_FGETS_REMAP
@@ -868,9 +868,9 @@ extern void uITRON4_free(void *p) ;
868868
#if defined(WOLFSSL_LEANPSK) && !defined(XMALLOC_USER) && \
869869
!defined(NO_WOLFSSL_MEMORY)
870870
#include <stdlib.h>
871-
#define XMALLOC(s, h, type) malloc((s))
872-
#define XFREE(p, h, type) free((p))
873-
#define XREALLOC(p, n, h, t) realloc((p), (n))
871+
#define XMALLOC(s, h, type) ((void)(h), (void)(type), malloc((s)))
872+
#define XFREE(p, h, type) ((void)(h), (void)(type), free((p)))
873+
#define XREALLOC(p, n, h, t) ((void)(h), (void)(t), realloc((p), (n)))
874874
#endif
875875

876876
#if defined(XMALLOC_USER) && defined(SSN_BUILDING_LIBYASSL)
@@ -889,16 +889,16 @@ extern void uITRON4_free(void *p) ;
889889

890890
#if !defined(XMALLOC_USER) && !defined(NO_WOLFSSL_MEMORY) && \
891891
!defined(WOLFSSL_STATIC_MEMORY) && !defined(WOLFSSL_TRACK_MEMORY)
892-
#define XMALLOC(s, h, type) pvPortMalloc((s))
893-
#define XFREE(p, h, type) vPortFree((p))
892+
#define XMALLOC(s, h, type) ((void)(h), (void)(type), pvPortMalloc((s)))
893+
#define XFREE(p, h, type) ((void)(h), (void)(type), vPortFree((p)))
894894
#if defined(WOLFSSL_ESPIDF)
895895
/* In IDF, realloc(p, n) is equivalent to
896896
* heap_caps_realloc(p, s, MALLOC_CAP_8BIT) */
897-
#define XREALLOC(p, n, h, t) realloc((p), (n))
897+
#define XREALLOC(p, n, h, t) ((void)(h), (void)(t), realloc((p), (n)))
898898
/* FreeRTOS pvPortRealloc() implementation can be found here:
899899
* https://github.com/wolfSSL/wolfssl-freertos/pull/3/files */
900900
#elif defined(USE_INTEGER_HEAP_MATH) || defined(OPENSSL_EXTRA)
901-
#define XREALLOC(p, n, h, t) pvPortRealloc((p), (n))
901+
#define XREALLOC(p, n, h, t) ((void)(h), (void)(t), pvPortRealloc((p), (n)))
902902
#endif
903903
#endif
904904

@@ -1018,9 +1018,9 @@ extern void uITRON4_free(void *p) ;
10181018
#define strtok_r strtok_s
10191019
#endif
10201020

1021-
#define XMALLOC(s, h, type) ((void *)rtp_malloc((s), SSL_PRO_MALLOC))
1022-
#define XFREE(p, h, type) (rtp_free(p))
1023-
#define XREALLOC(p, n, h, t) (rtp_realloc((p), (n), (t)))
1021+
#define XMALLOC(s, h, type) ((void)(h), (void)(type), ((void *)rtp_malloc((s), SSL_PRO_MALLOC)))
1022+
#define XFREE(p, h, type) ((void)(h), (void)(type), rtp_free(p))
1023+
#define XREALLOC(p, n, h, t) ((void)(h), rtp_realloc((p), (n), (t)))
10241024

10251025
#if (WINMSP3)
10261026
#define XSTRNCASECMP(s1,s2,n) _strnicmp((s1),(s2),(n))
@@ -1080,14 +1080,14 @@ extern void uITRON4_free(void *p) ;
10801080
#endif
10811081
#if !defined(XMALLOC_USER) && !defined(NO_WOLFSSL_MEMORY) && \
10821082
!defined(WOLFSSL_STATIC_MEMORY)
1083-
#define XMALLOC(s, h, type) pvPortMalloc((s))
1084-
#define XFREE(p, h, type) vPortFree((p))
1083+
#define XMALLOC(s, h, type) ((void)(h), (void)(type), pvPortMalloc((s)))
1084+
#define XFREE(p, h, type) ((void)(h), (void)(type), vPortFree((p)))
10851085

10861086
/* FreeRTOS pvPortRealloc() implementation can be found here:
10871087
https://github.com/wolfSSL/wolfssl-freertos/pull/3/files */
10881088
#if !defined(USE_FAST_MATH) || defined(HAVE_ED25519) || \
10891089
defined(HAVE_ED448)
1090-
#define XREALLOC(p, n, h, t) pvPortRealloc((p), (n))
1090+
#define XREALLOC(p, n, h, t) ((void)(h), (void)(t), pvPortRealloc((p), (n)))
10911091
#endif
10921092
#endif
10931093
#endif
@@ -1143,8 +1143,8 @@ extern void uITRON4_free(void *p) ;
11431143

11441144
#if !defined(XMALLOC_OVERRIDE) && !defined(XMALLOC_USER)
11451145
#define XMALLOC_OVERRIDE
1146-
#define XMALLOC(s, h, t) (void *)_mem_alloc_system((s))
1147-
#define XFREE(p, h, t) {void* xp = (p); if ((xp)) _mem_free((xp));}
1146+
#define XMALLOC(s, h, t) ((void)(h), (void)(t), (void *)_mem_alloc_system((s)))
1147+
#define XFREE(p, h, t) {void* xp = (p); (void)(h); (void)(t); if ((xp)) _mem_free((xp));}
11481148
/* Note: MQX has no realloc, using fastmath above */
11491149
#endif
11501150
#ifdef USE_FAST_MATH
@@ -1174,8 +1174,8 @@ extern void uITRON4_free(void *p) ;
11741174
#include <mutex.h>
11751175
#endif
11761176

1177-
#define XMALLOC(s, h, t) (void *)_mem_alloc_system((s))
1178-
#define XFREE(p, h, t) {void* xp = (p); if ((xp)) _mem_free((xp));}
1177+
#define XMALLOC(s, h, t) ((void)(h), (void)(t), (void *)_mem_alloc_system((s)))
1178+
#define XFREE(p, h, t) {void* xp = (p); (void)(h); (void)(t); if ((xp)) _mem_free((xp));}
11791179
#define XREALLOC(p, n, h, t) _mem_realloc((p), (n)) /* since MQX 4.1.2 */
11801180

11811181
#define MQX_FILE_PTR FILE *
@@ -1188,8 +1188,8 @@ extern void uITRON4_free(void *p) ;
11881188
#define WOLFSSL_CRYPT_HW_MUTEX 1
11891189

11901190
#if !defined(XMALLOC_USER) && !defined(NO_WOLFSSL_MEMORY)
1191-
#define XMALLOC(s, h, type) pvPortMalloc((s))
1192-
#define XFREE(p, h, type) vPortFree((p))
1191+
#define XMALLOC(s, h, type) ((void)(h), (void)(type), pvPortMalloc((s)))
1192+
#define XFREE(p, h, type) ((void)(h), (void)(type), vPortFree((p)))
11931193
#endif
11941194

11951195
/* #define USER_TICKS */
@@ -1851,9 +1851,9 @@ extern void uITRON4_free(void *p) ;
18511851
#define NO_SESSION_CACHE
18521852
#define NO_ERROR_STRINGS
18531853
#define XMALLOC_USER
1854-
#define XMALLOC(sz, heap, type) os_malloc(sz)
1855-
#define XREALLOC(p, sz, heap, type) os_realloc(p, sz)
1856-
#define XFREE(p, heap, type) os_free(p)
1854+
#define XMALLOC(sz, heap, type) ((void)(heap), (void)(type), os_malloc(sz))
1855+
#define XREALLOC(p, sz, heap, type) ((void)(heap), (void)(type), os_realloc(p, sz))
1856+
#define XFREE(p, heap, type) ((void)(heap), (void)(type), os_free(p))
18571857

18581858
#endif /*(WOLFSSL_APACHE_MYNEWT)*/
18591859

@@ -1991,9 +1991,9 @@ extern void uITRON4_free(void *p) ;
19911991
#include "RTOS.h"
19921992
#if !defined(XMALLOC_USER) && !defined(NO_WOLFSSL_MEMORY) && \
19931993
!defined(WOLFSSL_STATIC_MEMORY)
1994-
#define XMALLOC(s, h, type) OS_HEAP_malloc((s))
1995-
#define XFREE(p, h, type) OS_HEAP_free((p))
1996-
#define XREALLOC(p, n, h, t) OS_HEAP_realloc(((p), (n))
1994+
#define XMALLOC(s, h, type) ((void)(h), (void)(type), OS_HEAP_malloc((s)))
1995+
#define XFREE(p, h, type) ((void)(h), (void)(type), OS_HEAP_free((p)))
1996+
#define XREALLOC(p, n, h, t) ((void)(h), (void)(t), OS_HEAP_realloc(((p), (n)))
19971997
#endif
19981998
#endif
19991999

0 commit comments

Comments
 (0)