Skip to content

20260227 Coverity changes #9842

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

Merged
douzzer merged 5 commits into from
Mar 5, 2026
Merged

20260227 Coverity changes #9842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a8550c
compare to original type when searching private key headers, prevent …
rlm2002 Feb 24, 2026
5c257e1
remove redundant NULL check
rlm2002 Feb 26, 2026
d6c8e7b
add tmp variable to satisfy coverity before casting and assigning to …
rlm2002 Feb 27, 2026
0ef8541
validate hashAlgSz is within bounds before calling XMEMCPY
rlm2002 Mar 2, 2026
682901e
return MP_VAL if n < 0. remove check for max int value
rlm2002 Mar 3, 2026
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
23 changes: 15 additions & 8 deletions wolfcrypt/src/asn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7846,6 +7846,9 @@ word32 wc_EncodeRsaPssAlgoId(int hashOID, int saltLen, byte* out, word32 outSz)
if (outSz < outerSz) {
idx = 0; goto pss_algoid_done;
}
if (hashAlgSz > RSA_PSS_ALGOID_TMPBUF_SZ) {
idx = 0; goto pss_algoid_done;
}

{
word32 idPart = (word32)SetObjectId((int)rsapssOidSz, NULL) + rsapssOidSz;
Expand Down Expand Up @@ -11376,8 +11379,7 @@ int wc_RsaPublicKeyDecode_ex(const byte* input, word32* inOutIdx, word32 inSz,
if (ret != 0) {
/* Didn't work - try whole SubjectKeyInfo instead. Reset index
* to caller's start since the previous attempt advanced it. */
if (inOutIdx != NULL)
*inOutIdx = startIdx;
*inOutIdx = startIdx;
#ifdef WC_RSA_PSS
/* Could be RSA or RSA PSS key. */
GetASN_OID(&dataASN[RSAPUBLICKEYASN_IDX_ALGOID_OID], oidKeyType);
Expand Down Expand Up @@ -27618,6 +27620,7 @@ int PemToDer(const unsigned char* buff, long longSz, int type,
#ifdef OPENSSL_EXTRA
char beginBuf[PEM_LINE_LEN + 1]; /* add 1 for null terminator */
char endBuf[PEM_LINE_LEN + 1]; /* add 1 for null terminator */
int origType = type;
#endif
#ifdef WOLFSSL_ENCRYPTED_KEYS
int hashType = WC_HASH_TYPE_NONE;
Expand Down Expand Up @@ -27740,9 +27743,9 @@ int PemToDer(const unsigned char* buff, long longSz, int type,

if (!headerEnd) {
#ifdef OPENSSL_EXTRA
if (type == PRIVATEKEY_TYPE
if (origType == PRIVATEKEY_TYPE
#ifdef WOLFSSL_DUAL_ALG_CERTS
|| type == ALT_PRIVATEKEY_TYPE
|| origType == ALT_PRIVATEKEY_TYPE
#endif
) {
/* see if there is a -----BEGIN * PRIVATE KEY----- header */
Expand Down Expand Up @@ -42214,17 +42217,19 @@ static int EncodeCrlSerial(const byte* sn, word32 snSz, byte* output,
*/
static word32 EncodeRevokedCert(byte* output, const RevokedCert* rc)
{
int tmpSnSz;
word32 idx = 0;
word32 snSz, dateSz, seqSz;
byte snBuf[MAX_SN_SZ];
byte dateBuf[MAX_DATE_SIZE + 2]; /* tag + length + data */
byte seqBuf[MAX_SEQ_SZ];

/* Encode serial number */
snSz = (word32)EncodeCrlSerial(rc->serialNumber, (word32)rc->serialSz,
tmpSnSz = EncodeCrlSerial(rc->serialNumber, (word32)rc->serialSz,
snBuf, sizeof(snBuf));
if ((int)snSz < 0)
if (tmpSnSz < 0)
return 0;
snSz = (word32)tmpSnSz;

/* Encode revocation date */
dateSz = EncodeCrlDate(dateBuf, rc->revDate, rc->revDateFormat);
Expand Down Expand Up @@ -42255,6 +42260,7 @@ static word32 EncodeRevokedCert(byte* output, const RevokedCert* rc)
static word32 EncodeCrlNumberExt(byte* output, const byte* crlNum,
word32 crlNumSz)
{
int tmpIntSz;
word32 idx = 0;
word32 oidSz, intSz, octetSz, seqSz;
byte seqBuf[MAX_SEQ_SZ];
Expand All @@ -42266,9 +42272,10 @@ static word32 EncodeCrlNumberExt(byte* output, const byte* crlNum,
oidSz = sizeof(crlNumOid);

/* Encode the INTEGER for CRL number */
intSz = (word32)EncodeCrlSerial(crlNum, crlNumSz, intBuf, sizeof(intBuf));
if ((int)intSz < 0)
tmpIntSz = EncodeCrlSerial(crlNum, crlNumSz, intBuf, sizeof(intBuf));
if (tmpIntSz < 0)
return 0;
intSz = (word32)tmpIntSz;

/* Wrap INTEGER in OCTET STRING */
octetSz = SetOctetString(intSz, octetBuf);
Expand Down
5 changes: 2 additions & 3 deletions wolfcrypt/src/hpke.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,12 @@ static int I2OSP(int n, int w, byte* out)
{
int i;

if (w <= 0 || w > 32) {
if (w <= 0 || w > 32 || n < 0) {
return MP_VAL;
}

/* if width is less than int max check that n is less than w bytes max */
/* if width is greater than int max check that n is less than int max */
if ((w < 4 && n > ((1 << (w * 8)) - 1)) || (w >= 4 && n > 0x7fffffff)) {
if (w < 4 && n > ((1 << (w * 8)) - 1)) {
return MP_VAL;
}

Expand Down