wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-29 18:27:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5071 from dgarske/scan-build

Browse Source 
Fixes for various nightly scan-build errors and warnings
This commit is contained in:
John Safranek
2022-04-25 13:30:43 -07:00
committed by GitHub
parent 70ad19467c 34d541109d
commit bfd24cfa23
8 changed files with 51 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/client/client.c
View File

@ -2069,7 +2069,6 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
(void)resumeScr;
(void)ourKey;
(void)ourCert;
(void)customVerifyCert;
(void)verifyCert;
(void)useClientCert;
(void)disableCRL;
@ -3898,7 +3897,6 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
if (ret == WOLFSSL_SUCCESS) {
printf("NON-BLOCKING RENEGOTIATION SUCCESSFUL\n");
err = 0;
}
}
if (ret != WOLFSSL_SUCCESS) {
@ -4342,6 +4340,7 @@ exit:
(void) ourCert;
(void) ourKey;
(void) useVerifyCb;
(void) customVerifyCert;
#if !defined(WOLFSSL_TIRTOS)
return 0;

2
mcapi/crypto.h
View File

@ -173,7 +173,7 @@ enum {
typedef struct CRYPT_AES_CTX {
/* big enough to hold internal, but check on init */
#ifdef WOLF_PRIVATE_KEY_ID
int holder[104];
int holder[108];
#else
int holder[90];
#endif

22
mcapi/mcapi_test.c
View File

@ -562,14 +562,13 @@ static int check_compress(void)
printf("compress dynamic ret failed\n");
return -1;
}
outSz = ret1;
if (memcmp(cBuffer, dBuffer, ret1) != 0) {
if (memcmp(cBuffer, dBuffer, outSz) != 0) {
printf("compress dynamic cmp failed\n");
return -1;
}
outSz = ret1;
ret1 = CRYPT_HUFFMAN_DeCompress(dBuffer, sizeof(dBuffer), cBuffer, outSz);
if (memcmp(dBuffer, text, inSz) != 0) {
@ -578,9 +577,11 @@ static int check_compress(void)
}
memset(dBuffer, 0, sizeof(dBuffer));
ret2 = wc_DeCompress(dBuffer, sizeof(dBuffer), cBuffer, outSz);
ret1 = wc_DeCompress(dBuffer, sizeof(dBuffer), cBuffer, outSz);
if (ret1 != ret2 || ret2 < 0) {
printf("decompress dynamic ret failed\n");
}
if (memcmp(dBuffer, text, inSz) != 0) {
printf("decompress dynamic cmp failed\n");
return -1;
@ -597,13 +598,13 @@ static int check_compress(void)
printf("compress static ret failed\n");
return -1;
}
outSz = ret1;
if (memcmp(cBuffer, dBuffer, ret1) != 0) {
if (memcmp(cBuffer, dBuffer, outSz) != 0) {
printf("compress static cmp failed\n");
return -1;
}
outSz = ret1;
ret1 = CRYPT_HUFFMAN_DeCompress(dBuffer, sizeof(dBuffer), cBuffer, outSz);
@ -613,9 +614,10 @@ static int check_compress(void)
}
memset(dBuffer, 0, sizeof(dBuffer));
ret1 = wc_DeCompress(dBuffer, sizeof(dBuffer), cBuffer, outSz);
ret2 = wc_DeCompress(dBuffer, sizeof(dBuffer), cBuffer, outSz);
if (ret1 != ret2 || ret2 < 0) {
printf("decompress static ret failed\n");
}
if (memcmp(dBuffer, text, inSz) != 0) {
printf("decompress static cmp failed\n");
return -1;

25
src/internal.c
View File

@ -3872,12 +3872,12 @@ static enum wc_HashType HashAlgoToType(int hashAlgo)
void InitX509Name(WOLFSSL_X509_NAME* name, int dynamicFlag, void* heap)
{
(void)dynamicFlag;
(void)heap;
if (name != NULL) {
XMEMSET(name, 0, sizeof(WOLFSSL_X509_NAME));
name->name = name->staticName;
name->heap = heap;
name->dynamicName = 0;
}
}
@ -10743,12 +10743,16 @@ int CopyDecodedToX509(WOLFSSL_X509* x509, DecodedCert* dCert)
#endif
}
/* store cert for potential retrieval */
if (AllocDer(&x509->derCert, dCert->maxIdx, CERT_TYPE, x509->heap) == 0) {
XMEMCPY(x509->derCert->buffer, dCert->source, dCert->maxIdx);
}
else {
ret = MEMORY_E;
/* if der contains original source buffer then store for potential
* retrieval */
if (dCert->source != NULL && dCert->maxIdx > 0) {
if (AllocDer(&x509->derCert, dCert->maxIdx, CERT_TYPE, x509->heap)
== 0) {
XMEMCPY(x509->derCert->buffer, dCert->source, dCert->maxIdx);
}
else {
ret = MEMORY_E;
}
}
x509->altNames = dCert->altNames;
@ -11696,8 +11700,13 @@ static int ProcessPeerCertParse(WOLFSSL* ssl, ProcPeerCertArgs* args,
int sigRet = 0;
#endif
if (ssl == NULL || args == NULL)
if (ssl == NULL || args == NULL
#ifndef WOLFSSL_SMALL_CERT_VERIFY
|| args->dCert == NULL
#endif
) {
return BAD_FUNC_ARG;
}
/* check to make sure certificate index is valid */
if (args->certIdx > args->count)

9
src/ssl.c
View File

@ -7600,7 +7600,6 @@ int wolfSSL_CTX_load_verify_locations_ex(WOLFSSL_CTX* ctx, const char* file,
if (ret != WOLFSSL_SUCCESS) {
WOLFSSL_MSG("wolfSSL_CTX_trust_peer_cert error. Ignoring"
"this error.");
ret = WOLFSSL_SUCCESS;
}
#endif
successCount++;
@ -21463,6 +21462,7 @@ WOLFSSL_ASN1_INTEGER* wolfSSL_ASN1_INTEGER_new(void)
XMEMSET(a, 0, sizeof(WOLFSSL_ASN1_INTEGER));
a->data = a->intData;
a->isDynamic = 0;
a->dataMax = WOLFSSL_ASN1_INTEGER_MAX;
a->length = 0;
return a;
@ -24867,9 +24867,7 @@ void wolfSSL_sk_pop_free(WOLF_STACK_OF(WOLFSSL_ASN1_OBJECT)* sk,
WOLFSSL_STACK* next = sk->next;
if (func != NULL) {
if (sk->type == STACK_TYPE_CIPHER)
func(&sk->data.cipher);
else
if (sk->type != STACK_TYPE_CIPHER)
func(sk->data.generic);
}
XFREE(sk, NULL, DYNAMIC_TYPE_OPENSSL);
@ -25983,6 +25981,7 @@ WOLFSSL_ASN1_INTEGER* wolfSSL_BN_to_ASN1_INTEGER(const WOLFSSL_BIGNUM *bn, WOLFS
else {
XMEMSET(a->intData, 0, sizeof(a->intData));
a->data = a->intData;
a->isDynamic = 0;
}
/* populate data */
@ -40942,10 +40941,10 @@ int wolfSSL_a2i_ASN1_INTEGER(WOLFSSL_BIO *bio, WOLFSSL_ASN1_INTEGER *asn1,
/* Reset asn1 */
if (asn1->isDynamic && asn1->data) {
XFREE(asn1->data, NULL, DYNAMIC_TYPE_OPENSSL);
asn1->isDynamic = 0;
}
XMEMSET(asn1->intData, 0, WOLFSSL_ASN1_INTEGER_MAX);
asn1->data = asn1->intData;
asn1->isDynamic = 0;
asn1->length = 0;
asn1->negative = 0;
asn1->type = V_ASN1_INTEGER;

16
wolfcrypt/src/integer.c
View File

@ -511,7 +511,7 @@ void mp_zero (mp_int * a)
a->used = 0;
tmp = a->dp;
for (n = 0; n < a->alloc; n++) {
for (n = 0; tmp != NULL && n < a->alloc; n++) {
*tmp++ = 0;
}
}
@ -1713,7 +1713,7 @@ int s_mp_add (mp_int * a, mp_int * b, mp_int * c)
}
/* init result */
if (c->alloc < max_ab + 1) {
if (c->dp == NULL || c->alloc < max_ab + 1) {
if ((res = mp_grow (c, max_ab + 1)) != MP_OKAY) {
return res;
}
@ -1757,7 +1757,7 @@ int s_mp_add (mp_int * a, mp_int * b, mp_int * c)
if (min_ab != max_ab) {
for (; i < max_ab; i++) {
/* T[i] = X[i] + U */
*tmpc = x->dp[i] + u; // NOLINT(clang-analyzer-core.NullDereference) /* clang-tidy 13 false positive */
*tmpc = x->dp[i] + u;
/* U = carry bit of T[i] */
u = *tmpc >> ((mp_digit)DIGIT_BIT);
@ -2962,7 +2962,7 @@ int mp_mul_d (mp_int * a, mp_digit b, mp_int * c)
int ix, res, olduse;
/* make sure c is big enough to hold a*b */
if (c->alloc < a->used + 1) {
if (c->dp == NULL || c->alloc < a->used + 1) {
if ((res = mp_grow (c, a->used + 1)) != MP_OKAY) {
return res;
}
@ -4378,6 +4378,10 @@ int mp_add_d (mp_int* a, mp_digit b, mp_int* c) // NOLINT(misc-no-recursion)
/* destination alias */
tmpc = c->dp;
if (tmpa == NULL || tmpc == NULL) {
return MP_MEM;
}
/* if a is positive */
if (a->sign == MP_ZPOS) {
/* add digit, after this we're propagating
@ -4462,6 +4466,10 @@ int mp_sub_d (mp_int * a, mp_digit b, mp_int * c) // NOLINT(misc-no-recursion)
tmpa = a->dp;
tmpc = c->dp;
if (tmpa == NULL || tmpc == NULL) {
return MP_MEM;
}
/* if a <= b simply fix the single digit */
if ((a->used == 1 && a->dp[0] <= b) || a->used == 0) {
if (a->used == 1) {

1
wolfcrypt/src/rsa.c
View File

@ -3278,6 +3278,7 @@ static int RsaPrivateDecryptEx(const byte* in, word32 inLen, byte* out,
XMEMCPY(key->data, in, inLen);
}
else {
key->dataIsAlloc = 0;
key->data = out;
}
#endif

5
wolfcrypt/test/test.c
View File

@ -16674,11 +16674,11 @@ WOLFSSL_TEST_SUBROUTINE int dh_test(void)
#ifdef HAVE_FFDHE_4096
#ifdef HAVE_PUBLIC_FFDHE
ret = dh_ffdhe_test(&rng, wc_Dh_ffdhe4096_Get());
if (ret != 0)
ERROR_OUT(-8128, done);
#else
ret = dh_ffdhe_test(&rng, WC_FFDHE_4096);
#endif
if (ret != 0)
ERROR_OUT(-8128, done);
#endif
#endif /* !WC_NO_RNG */
#endif /* HAVE_FIPS_VERSION == 2 && !WOLFSSL_SP_ARM64_ASM */
@ -31862,6 +31862,7 @@ WOLFSSL_TEST_SUBROUTINE int compress_test(void)
if ((ret = wc_DeCompress(d, dSz, c, cSz)) != (int)dSz) {
ERROR_OUT(-12102, exit);
}
dSz = (word32)ret;
if (XMEMCMP(d, sample_text, dSz) != 0) {
ERROR_OUT(-12103, exit);