Skip to content

Bound CMAC response payloads against the received frame #474

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
yosuke-wolfssl wants to merge 1 commit into
base: main
Choose a base branch
from
+632 −15
Open

Bound CMAC response payloads against the received frame #474

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
81 changes: 66 additions & 15 deletions src/wh_client_crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5229,9 +5229,17 @@ int wh_Client_CmacGenerateResponse(whClientContext* ctx, Cmac* cmac,
ret = _getCryptoResponse(dataPtr, WC_ALGO_TYPE_CMAC, (uint8_t**)&res);
/* wolfCrypt allows positive error codes on success */
if (ret >= 0) {
/* Restore state from response (server has finalized; buffer/digest
* carry the post-finalization state). */
ret = wh_Crypto_CmacAesRestoreStateFromMsg(cmac, &res->resumeState);
const uint32_t hdr_sz =
sizeof(whMessageCrypto_GenericResponseHeader) + sizeof(*res);
/* The MAC bytes the response claims must be in the received frame */
if (res_len < hdr_sz || res->outSz > (res_len - hdr_sz)) {
ret = WH_ERROR_ABORTED;
}
if (ret >= 0) {
/* Restore state from response (server has finalized; buffer/digest
* carry the post-finalization state). */
ret = wh_Crypto_CmacAesRestoreStateFromMsg(cmac, &res->resumeState);
}
if (ret >= 0) {
ret = _CmacValidateTagLen(*outMacLen);
}
Expand Down Expand Up @@ -5349,10 +5357,17 @@ int wh_Client_CmacUpdateResponse(whClientContext* ctx, Cmac* cmac)

ret = _getCryptoResponse(dataPtr, WC_ALGO_TYPE_CMAC, (uint8_t**)&res);
if (ret >= 0) {
/* Restore full state from server. The server may leave a partial
* (or whole) block in its buffer after wc_CmacUpdate (CMAC's last
* block has special handling), so we round-trip the whole state. */
ret = wh_Crypto_CmacAesRestoreStateFromMsg(cmac, &res->resumeState);
/* No trailing payload on update, but the state must be in the frame */
if (res_len < sizeof(whMessageCrypto_GenericResponseHeader) +
sizeof(*res)) {
ret = WH_ERROR_ABORTED;
}
if (ret >= 0) {
/* Restore full state from server. The server may leave a partial
* (or whole) block in its buffer after wc_CmacUpdate (CMAC's last
* block has special handling), so we round-trip the whole state. */
ret = wh_Crypto_CmacAesRestoreStateFromMsg(cmac, &res->resumeState);
}
}
return ret;
}
Expand Down Expand Up @@ -5439,9 +5454,17 @@ int wh_Client_CmacFinalResponse(whClientContext* ctx, Cmac* cmac,

ret = _getCryptoResponse(dataPtr, WC_ALGO_TYPE_CMAC, (uint8_t**)&res);
if (ret >= 0) {
/* Restore final state from response (server's bufferSz is 0 after
* Final). */
ret = wh_Crypto_CmacAesRestoreStateFromMsg(cmac, &res->resumeState);
const uint32_t hdr_sz =
sizeof(whMessageCrypto_GenericResponseHeader) + sizeof(*res);
/* The MAC bytes the response claims must be in the received frame */
if (res_len < hdr_sz || res->outSz > (res_len - hdr_sz)) {
ret = WH_ERROR_ABORTED;
}
if (ret >= 0) {
/* Restore final state from response (server's bufferSz is 0 after
* Final). */
ret = wh_Crypto_CmacAesRestoreStateFromMsg(cmac, &res->resumeState);
}
if (ret >= 0) {
ret = _CmacValidateTagLen(*outMacLen);
}
Expand Down Expand Up @@ -5680,7 +5703,18 @@ int wh_Client_CmacGenerateDmaResponse(whClientContext* ctx, Cmac* cmac,
if (ret == WH_ERROR_OK) {
ret = _getCryptoResponse(dataPtr, WC_ALGO_TYPE_CMAC, (uint8_t**)&res);
if (ret >= 0) {
ret = wh_Crypto_CmacAesRestoreStateFromMsg(cmac, &res->resumeState);
const uint32_t hdr_sz =
sizeof(whMessageCrypto_GenericResponseHeader) + sizeof(*res);
/* The MAC bytes the response claims must be in the received
* frame. A failed server request replies with the generic header
* only, so this bound stays inside the success branch. */
if (respSz < hdr_sz || res->outSz > (respSz - hdr_sz)) {
ret = WH_ERROR_ABORTED;
}
if (ret >= 0) {
ret = wh_Crypto_CmacAesRestoreStateFromMsg(cmac,
&res->resumeState);
}
if (ret >= 0) {
ret = _CmacValidateTagLen(*outMacLen);
}
Expand Down Expand Up @@ -5825,9 +5859,18 @@ int wh_Client_CmacDmaUpdateResponse(whClientContext* ctx, Cmac* cmac)
if (ret == WH_ERROR_OK) {
ret = _getCryptoResponse(dataPtr, WC_ALGO_TYPE_CMAC, (uint8_t**)&res);
if (ret >= 0) {
/* Restore full state from server (includes any partial/whole
* block left in the server's wc_CmacUpdate buffer). */
ret = wh_Crypto_CmacAesRestoreStateFromMsg(cmac, &res->resumeState);
/* No trailing payload on update, but the state must be in the
* frame */
if (respSz < sizeof(whMessageCrypto_GenericResponseHeader) +
sizeof(*res)) {
ret = WH_ERROR_ABORTED;
}
if (ret >= 0) {
/* Restore full state from server (includes any partial/whole
* block left in the server's wc_CmacUpdate buffer). */
ret = wh_Crypto_CmacAesRestoreStateFromMsg(cmac,
&res->resumeState);
}
}
}

Expand Down Expand Up @@ -5914,7 +5957,15 @@ int wh_Client_CmacDmaFinalResponse(whClientContext* ctx, Cmac* cmac,

ret = _getCryptoResponse(dataPtr, WC_ALGO_TYPE_CMAC, (uint8_t**)&res);
if (ret >= 0) {
ret = wh_Crypto_CmacAesRestoreStateFromMsg(cmac, &res->resumeState);
const uint32_t hdr_sz =
sizeof(whMessageCrypto_GenericResponseHeader) + sizeof(*res);
/* The MAC bytes the response claims must be in the received frame */
if (respSz < hdr_sz || res->outSz > (respSz - hdr_sz)) {
ret = WH_ERROR_ABORTED;
}
if (ret >= 0) {
ret = wh_Crypto_CmacAesRestoreStateFromMsg(cmac, &res->resumeState);
}
if (ret >= 0) {
ret = _CmacValidateTagLen(*outMacLen);
}
Expand Down
Loading
Loading