feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

fix for cppcheck/zerodivcond in wolfcrypt/src/pkcs7.c:wc_PKCS7_DecodeAuthEnvelopedData();

Browse Source 
fixes for clang-tidy/bugprone-macro-parentheses in wolfssl/wolfcrypt/sp_int.{c,h} and wolfcrypt/src/ecc.c;

fix for clang-analyzer-deadcode.DeadStores in olfcrypt/src/asn.c.
This commit is contained in:
Daniel Pouzzner
2023-04-13 14:51:29 -05:00
parent 419a1f0a01
commit 358af4ef05
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wolfcrypt/src/asn.c
View File

@@ -6455,8 +6455,6 @@ static int _RsaPrivateKeyDecode(const byte* input, word32* inOutIdx,
#endif #endif
void* heap = NULL; void* heap = NULL;
(void)heap;
/* Check validity of parameters. */ /* Check validity of parameters. */
if ((inOutIdx == NULL) || (input == NULL) || ((key == NULL) && if ((inOutIdx == NULL) || (input == NULL) || ((key == NULL) &&
(keySz == NULL))) { (keySz == NULL))) {
@@ -6476,6 +6474,7 @@ static int _RsaPrivateKeyDecode(const byte* input, word32* inOutIdx,
} }
#endif #endif
(void)heap;
CALLOC_ASNGETDATA(dataASN, rsaKeyASN_Length, ret, heap); CALLOC_ASNGETDATA(dataASN, rsaKeyASN_Length, ret, heap);
if (ret == 0) { if (ret == 0) {

2
wolfcrypt/src/ecc.c
View File

@@ -1441,7 +1441,7 @@ static int xil_mpi_import(mp_int *mpi,
#ifdef WOLFSSL_SP_MATH_ALL #ifdef WOLFSSL_SP_MATH_ALL
#define DECLARE_CURVE_SPECS(intcount) \ #define DECLARE_CURVE_SPECS(intcount) \
unsigned char spec_ints[MP_INT_SIZEOF(MP_BITS_CNT( \ unsigned char spec_ints[MP_INT_SIZEOF(MP_BITS_CNT( \
MAX_ECC_BITS_USE)) * intcount]; \ MAX_ECC_BITS_USE)) * (intcount)]; \
ecc_curve_spec curve_lcl; \ ecc_curve_spec curve_lcl; \
ecc_curve_spec* curve = &curve_lcl; \ ecc_curve_spec* curve = &curve_lcl; \
XMEMSET(curve, 0, sizeof(ecc_curve_spec)); \ XMEMSET(curve, 0, sizeof(ecc_curve_spec)); \

3
wolfcrypt/src/pkcs7.c
View File

@@ -11887,7 +11887,8 @@ WOLFSSL_API int wc_PKCS7_DecodeAuthEnvelopedData(PKCS7* pkcs7, byte* in,
if (expBlockSz < 0) { if (expBlockSz < 0) {
ret = expBlockSz; ret = expBlockSz;
break; break;
} } else if (expBlockSz == 0)
expBlockSz = 1;
} }
} }

2
wolfcrypt/src/sp_int.c
View File

@@ -127,7 +127,7 @@ This library provides single precision (SP) integer math functions.
/* Declare a variable on the stack with the required data size. */ /* Declare a variable on the stack with the required data size. */
#define DECL_SP_INT(n, s) \ #define DECL_SP_INT(n, s) \
byte n##d[MP_INT_SIZEOF(s)]; \ byte n##d[MP_INT_SIZEOF(s)]; \
sp_int* n = (sp_int*)n##d sp_int* (n) = (sp_int*)n##d
#else #else
/* Declare a variable on the stack. */ /* Declare a variable on the stack. */
#define DECL_SP_INT(n, s) \ #define DECL_SP_INT(n, s) \

4
wolfssl/wolfcrypt/sp_int.h
View File

@@ -796,7 +796,7 @@ while (0)
/* Declare a dynamically allocated mp_int. */ /* Declare a dynamically allocated mp_int. */
#define DECL_MP_INT_SIZE_DYN(name, bits, max) \ #define DECL_MP_INT_SIZE_DYN(name, bits, max) \
unsigned char name##d[MP_INT_SIZEOF(MP_BITS_CNT(bits))]; \ unsigned char name##d[MP_INT_SIZEOF(MP_BITS_CNT(bits))]; \
sp_int* name = (sp_int*)name##d sp_int* (name) = (sp_int*)name##d
#else #else
/* Declare a dynamically allocated mp_int. */ /* Declare a dynamically allocated mp_int. */
#define DECL_MP_INT_SIZE_DYN(name, bits, max) \ #define DECL_MP_INT_SIZE_DYN(name, bits, max) \
@@ -806,7 +806,7 @@ while (0)
/* Declare a statically allocated mp_int. */ /* Declare a statically allocated mp_int. */
#define DECL_MP_INT_SIZE(name, bits) \ #define DECL_MP_INT_SIZE(name, bits) \
unsigned char name##d[MP_INT_SIZEOF(MP_BITS_CNT(bits))]; \ unsigned char name##d[MP_INT_SIZEOF(MP_BITS_CNT(bits))]; \
sp_int* name = (sp_int*)name##d sp_int* (name) = (sp_int*)name##d
/* Zero out mp_int of minimal size. */ /* Zero out mp_int of minimal size. */
#define NEW_MP_INT_SIZE(name, bits, heap, type) \ #define NEW_MP_INT_SIZE(name, bits, heap, type) \
XMEMSET(name, 0, MP_INT_SIZEOF(MP_BITS_CNT(bits))) XMEMSET(name, 0, MP_INT_SIZEOF(MP_BITS_CNT(bits)))