Skip to content

Added check in TLX_Parse to check if KeyShare extension is present SupportedGroups must be present too (and viceversa) #9250

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 1 commit into from
Oct 1, 2025
Merged

Added check in TLX_Parse to check if KeyShare extension is present SupportedGroups must be present too (and viceversa) #9250

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
18 changes: 18 additions & 0 deletions src/tls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16737,12 +16737,30 @@ int TLSX_Parse(WOLFSSL* ssl, const byte* input, word16 length, byte msgType,
ssl->options.noPskDheKe = 1;
}
#endif
#if defined(WOLFSSL_TLS13) && defined(HAVE_SUPPORTED_CURVES)
/* RFC 8446 Section 9.2: ClientHello with KeyShare must
* contain SupportedGroups and vice-versa. */
if (IsAtLeastTLSv1_3(ssl->version) && msgType == client_hello && isRequest) {
int hasKeyShare = !IS_OFF(seenType, TLSX_ToSemaphore(TLSX_KEY_SHARE));
int hasSupportedGroups = !IS_OFF(seenType, TLSX_ToSemaphore(TLSX_SUPPORTED_GROUPS));

if (hasKeyShare && !hasSupportedGroups) {
WOLFSSL_MSG("ClientHello with KeyShare extension missing required SupportedGroups extension");
return MISSING_HANDSHAKE_DATA;
}
if (hasSupportedGroups && !hasKeyShare) {
WOLFSSL_MSG("ClientHello with SupportedGroups extension missing required KeyShare extension");
return MISSING_HANDSHAKE_DATA;
}
}
#endif

if (ret == 0)
ret = SNI_VERIFY_PARSE(ssl, isRequest);
if (ret == 0)
ret = TCA_VERIFY_PARSE(ssl, isRequest);

WOLFSSL_LEAVE("Leaving TLSX_Parse", ret);
return ret;
}

Expand Down
Loading