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

fixes for cppcheck-2.13.0 --force:

Browse Source 
* fix null pointer derefs in wc_InitRsaKey_Id() and wc_InitRsaKey_Label() (nullPointerRedundantCheck).
* fix use of wrong printf variant in rsip_vprintf() (wrongPrintfScanfArgNum).
* fix wrong printf format in bench_xmss_sign_verify() (invalidPrintfArgType_sint).
* add missing WOLFSSL_XFREE_NO_NULLNESS_CHECK variants of XFREE() (WOLFSSL_LINUXKM, FREESCALE_MQX, FREESCALE_KSDK_MQX).
* suppress false-positive uninitvar on "limit" in CheckTLS13AEADSendLimit().
* suppress true-but-benign-positive autoVariables in DoClientHello().
* in wolfcrypt/src/ecc.c, refactor ECC_KEY_MAX_BITS() as a local function to resolve true-but-benign-positive identicalInnerCondition.
* refactor flow in wc_ecc_sign_hash_ex() to resolve true-but-benign-positive identicalInnerCondition.
This commit is contained in:
Daniel Pouzzner
2023-12-28 15:06:21 -06:00
parent 457188f55e
commit 44b18de704
7 changed files with 53 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
linuxkm/linuxkm_wc_port.h
View File

@@ -636,11 +636,19 @@
#ifdef WOLFSSL_TRACK_MEMORY #ifdef WOLFSSL_TRACK_MEMORY
#include <wolfssl/wolfcrypt/memory.h> #include <wolfssl/wolfcrypt/memory.h>
#define XMALLOC(s, h, t) ({(void)(h); (void)(t); wolfSSL_Malloc(s);}) #define XMALLOC(s, h, t) ({(void)(h); (void)(t); wolfSSL_Malloc(s);})
#define XFREE(p, h, t) ({void* _xp; (void)(h); _xp = (p); if(_xp) wolfSSL_Free(_xp);}) #ifdef WOLFSSL_XFREE_NO_NULLNESS_CHECK
#define XFREE(p, h, t) ({(void)(h); (void)(t); wolfSSL_Free(p);})
#else
#define XFREE(p, h, t) ({void* _xp; (void)(h); _xp = (p); if(_xp) wolfSSL_Free(_xp);})
#endif
#define XREALLOC(p, n, h, t) ({(void)(h); (void)(t); wolfSSL_Realloc(p, n);}) #define XREALLOC(p, n, h, t) ({(void)(h); (void)(t); wolfSSL_Realloc(p, n);})
#else #else
#define XMALLOC(s, h, t) ({(void)(h); (void)(t); malloc(s);}) #define XMALLOC(s, h, t) ({(void)(h); (void)(t); malloc(s);})
#define XFREE(p, h, t) ({void* _xp; (void)(h); _xp = (p); if(_xp) free(_xp);}) #ifdef WOLFSSL_XFREE_NO_NULLNESS_CHECK
#define XFREE(p, h, t) ({(void)(h); (void)(t); free(p);})
#else
#define XFREE(p, h, t) ({void* _xp; (void)(h); (void)(t); _xp = (p); if(_xp) free(_xp);})
#endif
#define XREALLOC(p, n, h, t) ({(void)(h); (void)(t); realloc(p, n);}) #define XREALLOC(p, n, h, t) ({(void)(h); (void)(t); realloc(p, n);})
#endif #endif

8
src/internal.c
View File

@@ -23944,8 +23944,11 @@ static int CheckTLS13AEADSendLimit(WOLFSSL* ssl)
ssl->keys.sequence_number_lo); ssl->keys.sequence_number_lo);
} }
if (w64GTE(seq, limit)) if (w64GTE(seq, limit)) { /* cppcheck-suppress uninitvar
* (false positive from cppcheck-2.13.0)
*/
return Tls13UpdateKeys(ssl); /* Need to generate new keys */ return Tls13UpdateKeys(ssl); /* Need to generate new keys */
}
return 0; return 0;
} }
@@ -35828,7 +35831,8 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
#endif #endif
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
ssl->clSuites = clSuites; ssl->clSuites = clSuites; /* cppcheck-suppress autoVariables
*/
/* Give user last chance to provide a cert for cipher selection */ /* Give user last chance to provide a cert for cipher selection */
if (ret == 0 && ssl->ctx->certSetupCb != NULL) if (ret == 0 && ssl->ctx->certSetupCb != NULL)
ret = CertSetupCbWrapper(ssl); ret = CertSetupCbWrapper(ssl);

2
wolfcrypt/benchmark/benchmark.c
View File

@@ -9641,7 +9641,7 @@ static void bench_xmss_sign_verify(const char * params)
ret = wc_XmssKey_GetPubLen(&key, &pkSz); ret = wc_XmssKey_GetPubLen(&key, &pkSz);
if (pkSz != XMSS_SHA256_PUBLEN) { if (pkSz != XMSS_SHA256_PUBLEN) {
fprintf(stderr, "error: xmss pub len: got %d, expected %d\n", pkSz, fprintf(stderr, "error: xmss pub len: got %u, expected %d\n", pkSz,
XMSS_SHA256_PUBLEN); XMSS_SHA256_PUBLEN);
goto exit_xmss_sign_verify; goto exit_xmss_sign_verify;
} }

29
wolfcrypt/src/ecc.c
View File

@@ -251,17 +251,20 @@ ECC Curve Sizes:
#else #else
#define MAX_ECC_BITS_USE MAX_ECC_BITS_NEEDED #define MAX_ECC_BITS_USE MAX_ECC_BITS_NEEDED
#endif #endif
#if !defined(WOLFSSL_CUSTOM_CURVES) && (ECC_MIN_KEY_SZ > 160) && \
(!defined(HAVE_ECC_KOBLITZ) || (ECC_MIN_KEY_SZ > 224)) static WC_MAYBE_UNUSED WC_INLINE word32 ECC_KEY_MAX_BITS(const ecc_key *key) {
#define ECC_KEY_MAX_BITS(key) \ if (((key) == NULL) || ((key)->dp == NULL))
((((key) == NULL) || ((key)->dp == NULL)) ? MAX_ECC_BITS_USE : \ return MAX_ECC_BITS_USE;
((unsigned)((key)->dp->size * 8))) else {
#else #if !defined(WOLFSSL_CUSTOM_CURVES) && (ECC_MIN_KEY_SZ > 160) && \
/* Add one bit for cases when order is a bit greater than prime. */ (!defined(HAVE_ECC_KOBLITZ) || (ECC_MIN_KEY_SZ > 224))
#define ECC_KEY_MAX_BITS(key) \ return (word32)((key)->dp->size * 8);
((((key) == NULL) || ((key)->dp == NULL)) ? MAX_ECC_BITS_USE : \ #else
((unsigned)((key)->dp->size * 8 + 1))) /* Add one bit for cases when order is a bit greater than prime. */
#endif return (word32)((key)->dp->size * 8 + 1);
#endif
}
}
/* forward declarations */ /* forward declarations */
static int wc_ecc_new_point_ex(ecc_point** point, void* heap); static int wc_ecc_new_point_ex(ecc_point** point, void* heap);
@@ -7263,10 +7266,10 @@ int wc_ecc_sign_hash_ex(const byte* in, word32 inlen, WC_RNG* rng,
pubkey = (ecc_key*)XMALLOC(sizeof(ecc_key), key->heap, DYNAMIC_TYPE_ECC); pubkey = (ecc_key*)XMALLOC(sizeof(ecc_key), key->heap, DYNAMIC_TYPE_ECC);
if (pubkey == NULL) if (pubkey == NULL)
err = MEMORY_E; err = MEMORY_E;
else
#endif #endif
{
/* don't use async for key, since we don't support async return here */ /* don't use async for key, since we don't support async return here */
if (err == MP_OKAY) {
err = wc_ecc_init_ex(pubkey, key->heap, INVALID_DEVID); err = wc_ecc_init_ex(pubkey, key->heap, INVALID_DEVID);
if (err == MP_OKAY) { if (err == MP_OKAY) {
err = ecc_sign_hash_sw(key, pubkey, rng, curve, e, r, s); err = ecc_sign_hash_sw(key, pubkey, rng, curve, e, r, s);

12
wolfcrypt/src/rsa.c
View File

@@ -267,8 +267,10 @@ int wc_InitRsaKey_Id(RsaKey* key, unsigned char* id, int len, void* heap,
ret = BUFFER_E; ret = BUFFER_E;
#if defined(HAVE_PKCS11) #if defined(HAVE_PKCS11)
XMEMSET(key, 0, sizeof(RsaKey)); if (ret == 0) {
key->isPkcs11 = 1; XMEMSET(key, 0, sizeof(RsaKey));
key->isPkcs11 = 1;
}
#endif #endif
if (ret == 0) if (ret == 0)
@@ -302,8 +304,10 @@ int wc_InitRsaKey_Label(RsaKey* key, const char* label, void* heap, int devId)
} }
#if defined(HAVE_PKCS11) #if defined(HAVE_PKCS11)
XMEMSET(key, 0, sizeof(RsaKey)); if (ret == 0) {
key->isPkcs11 = 1; XMEMSET(key, 0, sizeof(RsaKey));
key->isPkcs11 = 1;
}
#endif #endif
if (ret == 0) if (ret == 0)

2
wolfcrypt/test/test.c
View File

@@ -212,7 +212,7 @@ const byte const_byte_array[] = "A+Gd\0\0\0";
int ret; int ret;
char tmpBuf[80]; char tmpBuf[80];
ret = XSNPRINTF(tmpBuf, sizeof(tmpBuf), format, args); ret = vsnprintf(tmpBuf, sizeof(tmpBuf), format, args);
printf(tmpBuf); printf(tmpBuf);
return ret; return ret;

13
wolfssl/wolfcrypt/settings.h
View File

@@ -1193,7 +1193,12 @@ extern void uITRON4_free(void *p) ;
#if !defined(XMALLOC_OVERRIDE) && !defined(XMALLOC_USER) #if !defined(XMALLOC_OVERRIDE) && !defined(XMALLOC_USER)
#define XMALLOC_OVERRIDE #define XMALLOC_OVERRIDE
#define XMALLOC(s, h, t) ((void)(h), (void)(t), (void *)_mem_alloc_system((s))) #define XMALLOC(s, h, t) ((void)(h), (void)(t), (void *)_mem_alloc_system((s)))
#define XFREE(p, h, t) {void* xp = (p); (void)(h); (void)(t); if ((xp)) _mem_free((xp));} #ifdef WOLFSSL_XFREE_NO_NULLNESS_CHECK
#define XFREE(p, h, t) {(void)(h); (void)(t); _mem_free(p);}
#else
#define XFREE(p, h, t) {void* xp = (p); (void)(h); (void)(t); if ((xp)) _mem_free((xp));}
#endif
/* Note: MQX has no realloc, using fastmath above */ /* Note: MQX has no realloc, using fastmath above */
#endif #endif
#ifdef USE_FAST_MATH #ifdef USE_FAST_MATH
@@ -1224,7 +1229,11 @@ extern void uITRON4_free(void *p) ;
#endif #endif
#define XMALLOC(s, h, t) ((void)(h), (void)(t), (void *)_mem_alloc_system((s))) #define XMALLOC(s, h, t) ((void)(h), (void)(t), (void *)_mem_alloc_system((s)))
#define XFREE(p, h, t) {void* xp = (p); (void)(h); (void)(t); if ((xp)) _mem_free((xp));} #ifdef WOLFSSL_XFREE_NO_NULLNESS_CHECK
#define XFREE(p, h, t) {(void)(h); (void)(t); _mem_free(p);}
#else
#define XFREE(p, h, t) {void* xp = (p); (void)(h); (void)(t); if ((xp)) _mem_free((xp));}
#endif
#define XREALLOC(p, n, h, t) _mem_realloc((p), (n)) /* since MQX 4.1.2 */ #define XREALLOC(p, n, h, t) _mem_realloc((p), (n)) /* since MQX 4.1.2 */
#define MQX_FILE_PTR FILE * #define MQX_FILE_PTR FILE *