Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

20230724-cppcheck-2v11 #6652

Merged
merged 1 commit into from
Jul 25, 2023
Merged

20230724-cppcheck-2v11 #6652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16823,7 +16823,7 @@ int wolfSSL_DtlsUpdateWindow(word16 cur_hi, word32 cur_lo,
diff %= DTLS_WORD_BITS;

if (idx < WOLFSSL_DTLS_WINDOW_WORDS)
window[idx] |= (1 << diff);
window[idx] |= (1U << diff);
}
else {
_DtlsUpdateWindowGTSeq(diff + 1, window);
Expand Down
7 changes: 6 additions & 1 deletion src/ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13684,7 +13684,8 @@ int wolfSSL_GetSessionFromCache(WOLFSSL* ssl, WOLFSSL_SESSION* output)
#endif
if (output->ticketLenAlloc)
XFREE(output->ticket, output->heap, DYNAMIC_TYPE_SESSION_TICK);
output->ticket = tmpTicket;
output->ticket = tmpTicket; /* cppcheck-suppress autoVariables
*/
output->ticketLenAlloc = PREALLOC_SESSION_TICKET_LEN;
output->ticketLen = 0;
tmpBufSet = 1;
Expand Down Expand Up @@ -13772,6 +13773,10 @@ int wolfSSL_GetSessionFromCache(WOLFSSL* ssl, WOLFSSL_SESSION* output)
#endif /* HAVE_SESSION_TICKET && WOLFSSL_TLS13 */
}

/* mollify confused cppcheck nullPointer warning. */
if (sess == NULL)
error = WOLFSSL_FAILURE;

if (error == WOLFSSL_SUCCESS) {
#if defined(HAVE_SESSION_TICKET) && defined(WOLFSSL_TLS13)
error = wolfSSL_DupSessionEx(sess, output, 1,
Expand Down
36 changes: 24 additions & 12 deletions wolfcrypt/src/asn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32124,15 +32124,19 @@ static int EccSpecifiedECDomainDecode(const byte* input, word32 inSz,
}
#ifndef WOLFSSL_NO_ASN_STRICT
/* Only version 2 and above can have a seed. */
if ((ret == 0) && (dataASN[ECCSPECIFIEDASN_IDX_PARAM_SEED].tag != 0) &&
if (ret == 0) {
if ((dataASN[ECCSPECIFIEDASN_IDX_PARAM_SEED].tag != 0) &&
(version < 2)) {
ret = ASN_PARSE_E;
ret = ASN_PARSE_E;
}
}
#endif
/* Only version 2 and above can have a hash algorithm. */
if ((ret == 0) && (dataASN[ECCSPECIFIEDASN_IDX_HASH_SEQ].tag != 0) &&
if (ret == 0) {
if ((dataASN[ECCSPECIFIEDASN_IDX_HASH_SEQ].tag != 0) &&
(version < 2)) {
ret = ASN_PARSE_E;
ret = ASN_PARSE_E;
}
}
if ((ret == 0) && (dataASN[ECCSPECIFIEDASN_IDX_COFACTOR].tag != 0)) {
/* Store optional co-factor. */
Expand Down Expand Up @@ -32447,8 +32451,10 @@ int wc_EccPrivateKeyDecode(const byte* input, word32* inOutIdx, ecc_key* key,
inOutIdx, inSz);
}
/* Only version 1 supported. */
if ((ret == 0) && (version != 1)) {
ret = ASN_PARSE_E;
if (ret == 0) {
if (version != 1) {
ret = ASN_PARSE_E;
}
}
/* Curve Parameters are optional. */
if ((ret == 0) && (dataASN[ECCKEYASN_IDX_PARAMS].tag != 0)) {
Expand Down Expand Up @@ -34416,8 +34422,10 @@ static int DecodeSingleResponse(byte* source, word32* ioIndex, word32 size,
ret = ASN_PARSE_E;
}
/* Validate the issuer key hash length is the size required. */
if ((ret == 0) && (issuerKeyHashLen != ocspDigestSize)) {
ret = ASN_PARSE_E;
if (ret == 0) {
if (issuerKeyHashLen != ocspDigestSize) {
ret = ASN_PARSE_E;
}
}
if (ret == 0) {
/* Store serial size. */
Expand Down Expand Up @@ -34804,12 +34812,16 @@ static int DecodeResponseData(byte* source, word32* ioIndex,
1, source, ioIndex, size);
}
/* Only support v1 == 0 */
if ((ret == 0) && (version != 0)) {
ret = ASN_PARSE_E;
if (ret == 0) {
if (version != 0) {
ret = ASN_PARSE_E;
}
}
/* Ensure date is a minimal size. */
if ((ret == 0) && (dateSz < MIN_DATE_SIZE)) {
ret = ASN_PARSE_E;
if (ret == 0) {
if (dateSz < MIN_DATE_SIZE) {
ret = ASN_PARSE_E;
}
}
if (ret == 0) {
/* TODO: use byName/byKey fields. */
Expand Down
Loading