Skip to content

ecc: fix crash in wc_ecc_import_point_der_ex on invalid format byte #9986

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

Open
MarkAtwood wants to merge 2 commits into
base: master
Choose a base branch
from
+13 −7
Open

ecc: fix crash in wc_ecc_import_point_der_ex on invalid format byte #9986

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cea9fd7
ecc: reject compressed points with incorrect length
MarkAtwood Mar 16, 2026
cedc3c8
ecc: fix double-free in wc_ecc_import_point_der_ex on invalid format …
MarkAtwood Mar 16, 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
20 changes: 13 additions & 7 deletions wolfcrypt/src/ecc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9439,6 +9439,14 @@ int wc_ecc_import_point_der_ex(const byte* in, word32 inLen,
return ECC_BAD_ARG_E;
}

/* validate point format byte before any memory operations */
pointType = in[0];
if (pointType != ECC_POINT_UNCOMP &&
pointType != ECC_POINT_COMP_EVEN &&
pointType != ECC_POINT_COMP_ODD) {
return ASN_PARSE_E;
}
Comment on lines +9442 to +9448

/* clear if previously allocated */
mp_clear(point->x);
mp_clear(point->y);
Expand All @@ -9460,16 +9468,14 @@ int wc_ecc_import_point_der_ex(const byte* in, word32 inLen,

SAVE_VECTOR_REGISTERS(return _svr_ret;);

/* check for point type (4, 2, or 3) */
pointType = in[0];
if (pointType != ECC_POINT_UNCOMP && pointType != ECC_POINT_COMP_EVEN &&
pointType != ECC_POINT_COMP_ODD) {
err = ASN_PARSE_E;
}

/* pointType already validated above; check for compressed format */
if (pointType == ECC_POINT_COMP_EVEN || pointType == ECC_POINT_COMP_ODD) {
#ifdef HAVE_COMP_KEY
compressed = 1;
/* compressed points must be exactly 1 + field_element_size bytes */
if (inLen != 1 + (word32)ecc_sets[curve_idx].size) {
err = ECC_BAD_ARG_E;
}
Comment on lines 9474 to +9478
#else
err = NOT_COMPILED_IN;
#endif
Expand Down
Loading