Skip to content

asn: fix GetShortInt for asn original. #10458

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
SparkiDev merged 1 commit into from
May 13, 2026
+21 −1
Merged

asn: fix GetShortInt for asn original. #10458

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
15 changes: 14 additions & 1 deletion tests/api/test_asn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,20 @@ int test_GetSetShortInt(void)
ExpectIntEQ(GetShortInt(valDer, &idx, &value, 6),
WC_NO_ERR_TRACE(ASN_EXPECT_0_E));
}
#endif

#if (!defined(HAVE_SELFTEST) && !defined(HAVE_FIPS)) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2))
/* zero length value. should return ASN_PARSE_E */
{
word32 idx = 0;
int value = 0;
valDer[0] = ASN_INTEGER;
valDer[1] = 0x00;
ExpectIntEQ(GetShortInt(valDer, &idx, &value, 2),
WC_NO_ERR_TRACE(ASN_PARSE_E));
}
#endif /* */
#endif /* !NO_PWDBASED || WOLFSSL_ASN_EXTRA */
Comment thread
philljj marked this conversation as resolved.
#endif

return EXPECT_RESULT();
Expand Down
7 changes: 7 additions & 0 deletions wolfcrypt/src/asn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3465,6 +3465,13 @@ int GetShortInt(const byte* input, word32* inOutIdx, int* number, word32 maxIdx)
if (len > 4)
return ASN_PARSE_E;

/* to be consistent with GetASN_Integer */
#if (!defined(HAVE_SELFTEST) && !defined(HAVE_FIPS)) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2))
if (len == 0)
return ASN_PARSE_E;
#endif

if (len + idx > maxIdx)
return ASN_PARSE_E;

Expand Down
Loading