Skip to content

F-3803: validate response sizes #367

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 1 commit into
base: main
Choose a base branch
from
+21 −8
Open

F-3803: validate response sizes #367

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
29 changes: 21 additions & 8 deletions src/wh_client_crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3409,10 +3409,13 @@ int wh_Client_Ed25519Sign(whClientContext* ctx, ed25519_key* key,
ret = _getCryptoResponse(dataPtr, WC_PK_TYPE_ED25519_SIGN,
(uint8_t**)&res);
if (ret >= 0) {
uint32_t res_total =
const uint32_t res_len_min =
sizeof(whMessageCrypto_GenericResponseHeader) +
sizeof(*res) + res->sigSz;
if (res_total > res_len) {
sizeof(*res);
if (res_len < res_len_min) {
ret = WH_ERROR_ABORTED;
}
else if (res->sigSz > (uint32_t)res_len - res_len_min) {
ret = WH_ERROR_ABORTED;
}
}
Expand Down Expand Up @@ -3547,14 +3550,16 @@ int wh_Client_Ed25519Verify(whClientContext* ctx, ed25519_key* key,
if (ret == WH_ERROR_OK) {
ret = _getCryptoResponse(dataPtr, WC_PK_TYPE_ED25519_VERIFY,
(uint8_t**)&res);
if (ret >= 0 && res != NULL) {
uint32_t res_total =
if (ret >= 0) {
const uint32_t res_len_min =
sizeof(whMessageCrypto_GenericResponseHeader) +
sizeof(*res);
if (res_total > res_len) {
if (res_len >= res_len_min) {
*out_res = res->res;
}
else {
ret = WH_ERROR_ABORTED;
}
*out_res = res->res;
}
}
}
Expand Down Expand Up @@ -7808,7 +7813,15 @@ int wh_Client_MlDsaVerify(whClientContext* ctx, const byte* sig, word32 sig_len,
/* wolfCrypt allows positive error codes on success in some
* scenarios */
if (ret >= 0) {
*out_res = res->res;
const uint32_t res_len_min =
sizeof(whMessageCrypto_GenericResponseHeader) +
sizeof(*res);
if (res_len >= res_len_min) {
*out_res = res->res;
}
else {
ret = WH_ERROR_ABORTED;
}
}
}
}
Expand Down
Loading