Skip to content

Add size check in wh_Client_Curve25519SharedSecret #361

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
padelsbach wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add size check in wh_Client_Curve25519SharedSecret #361

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
721d935
Add size check in wh_Client_Curve25519SharedSecret
padelsbach May 11, 2026
4e292e3
Adjust to look more like ECDH
padelsbach May 12, 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
28 changes: 22 additions & 6 deletions src/wh_client_crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2826,14 +2826,30 @@ int wh_Client_Curve25519SharedSecret(whClientContext* ctx,
/* wolfCrypt allows positive error codes on success in some
* scenarios */
if (ret >= 0) {
uint8_t* res_out = (uint8_t*)(res + 1);
const size_t hdr_sz =
sizeof(whMessageCrypto_GenericResponseHeader) +
sizeof(*res);
/* Defensive bound: res->sz must fit within the actual
* received frame */
if (res_len < hdr_sz || res->sz > (res_len - hdr_sz)) {
ret = WH_ERROR_ABORTED;
}
if (out_size != NULL) {
if ((ret >= 0) &&
(out != NULL) && (res->sz > *out_size)) {
/* Output buffer too small. Report required size
* and fail rather than silently truncating
* X25519 key material. */
ret = WH_ERROR_BUFFER_SIZE;
}
/* Give caller the required size, even on failure */
*out_size = res->sz;
}
if (out != NULL) {
uint8_t* res_out = (uint8_t*)(res + 1);
memcpy(out, res_out, res->sz);
WH_DEBUG_VERBOSE_HEXDUMP("[client] X25519:", res_out,
res->sz);
if ((ret >= 0) && (out != NULL) && (res->sz > 0)) {
memcpy(out, res_out, res->sz);
WH_DEBUG_VERBOSE_HEXDUMP("[client] X25519:",
res_out, res->sz);
}
}
}
}
Expand Down
Loading