Skip to content

add sanity check on keysize found with ECC point import #9989

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
dgarske merged 1 commit into from
Mar 17, 2026
Merged

add sanity check on keysize found with ECC point import #9989

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
7 changes: 7 additions & 0 deletions wolfcrypt/src/ecc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9487,6 +9487,13 @@ int wc_ecc_import_point_der_ex(const byte* in, word32 inLen,
keysize = (int)(inLen>>1);
#endif

/* sanity check that x coordinate is expected size */
if (err == MP_OKAY) {
if (keysize != ecc_sets[curve_idx].size) {
err = ECC_BAD_ARG_E;
}
}
Comment thread
JacobBarthelmeh marked this conversation as resolved.

/* read data */
if (err == MP_OKAY)
err = mp_read_unsigned_bin(point->x, in, (word32)keysize);
Expand Down
26 changes: 26 additions & 0 deletions wolfcrypt/test/test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35072,6 +35072,32 @@ static wc_test_ret_t ecc_point_test(void)

#if defined(HAVE_COMP_KEY) && (!defined(HAVE_FIPS) && !defined(HAVE_SELFTEST) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2)))
/* Test compressed point with missing x coordinate bytes */
ret = wc_ecc_import_point_der(derComp0, 1, curve_idx, point3);
if (ret != WC_NO_ERR_TRACE(ECC_BAD_ARG_E)) {
ret = WC_TEST_RET_ENC_EC(ret);
goto done;
}

ret = wc_ecc_import_point_der(derComp1, 1, curve_idx, point3);
if (ret != WC_NO_ERR_TRACE(ECC_BAD_ARG_E)) {
ret = WC_TEST_RET_ENC_EC(ret);
goto done;
}

/* Full uncompressed P-256 length (65 bytes) but invalid prefix byte */
{
byte invalidType[65];
XMEMSET(invalidType, 0x42, sizeof(invalidType));
invalidType[0] = 0x01;
ret = wc_ecc_import_point_der_ex(invalidType, sizeof(invalidType),
curve_idx, point3, 0);
if (ret != WC_NO_ERR_TRACE(ASN_PARSE_E)) {
ret = WC_TEST_RET_ENC_EC(ret);
goto done;
}
}

ret = wc_ecc_import_point_der(derComp0, sizeof(derComp0)*2-1, curve_idx, point3);
if (ret != 0)
ERROR_OUT(WC_TEST_RET_ENC_EC(ret), done);
Expand Down
Loading