Skip to content

Bound AES DMA response frames in the crypto client #475

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
+539 −24
Open

Bound AES DMA response frames in the crypto client #475

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: 57 additions & 24 deletions src/wh_client_crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,14 +709,23 @@ int wh_Client_AesCtrDmaResponse(whClientContext* ctx, Aes* aes)
if (ret == WH_ERROR_OK) {
ret = _getCryptoResponse(dataPtr, WC_CIPHER_AES_CTR, (uint8_t**)&res);
if (ret == WH_ERROR_OK) {
uint8_t* res_iv =
(uint8_t*)res + sizeof(whMessageCrypto_AesCtrDmaResponse);
uint8_t* res_tmp = res_iv + AES_IV_SIZE;
aes->left = res->left;
memcpy((uint8_t*)aes->reg, res_iv, AES_IV_SIZE);
memcpy((uint8_t*)aes->tmp, res_tmp, AES_BLOCK_SIZE);
WH_DEBUG_CLIENT_VERBOSE("AesCtr DMA res: left=%u\n",
(unsigned int)res->left);
/* Trailing payload is: reg (AES_IV_SIZE) + tmp (AES_BLOCK_SIZE) */
const uint32_t hdr_sz =
sizeof(whMessageCrypto_GenericResponseHeader) + sizeof(*res) +
AES_IV_SIZE + AES_BLOCK_SIZE;
if (res_len < hdr_sz) {
ret = WH_ERROR_ABORTED;
}
else {
uint8_t* res_iv =
(uint8_t*)res + sizeof(whMessageCrypto_AesCtrDmaResponse);
uint8_t* res_tmp = res_iv + AES_IV_SIZE;
aes->left = res->left;
memcpy((uint8_t*)aes->reg, res_iv, AES_IV_SIZE);
memcpy((uint8_t*)aes->tmp, res_tmp, AES_BLOCK_SIZE);
WH_DEBUG_CLIENT_VERBOSE("AesCtr DMA res: left=%u\n",
(unsigned int)res->left);
}
}
}

Expand Down Expand Up @@ -1026,7 +1035,14 @@ int wh_Client_AesEcbDmaResponse(whClientContext* ctx, Aes* aes)
if (ret == WH_ERROR_OK) {
ret = _getCryptoResponse(dataPtr, WC_CIPHER_AES_ECB, (uint8_t**)&res);
if (ret == WH_ERROR_OK) {
WH_DEBUG_CLIENT_VERBOSE("AesEcb DMA res: ok\n");
const uint32_t hdr_sz =
sizeof(whMessageCrypto_GenericResponseHeader) + sizeof(*res);
if (res_len < hdr_sz) {
ret = WH_ERROR_ABORTED;
}
else {
WH_DEBUG_CLIENT_VERBOSE("AesEcb DMA res: ok\n");
}
}
}

Expand Down Expand Up @@ -1362,10 +1378,19 @@ int wh_Client_AesCbcDmaResponse(whClientContext* ctx, Aes* aes)
if (ret == WH_ERROR_OK) {
ret = _getCryptoResponse(dataPtr, WC_CIPHER_AES_CBC, (uint8_t**)&res);
if (ret == WH_ERROR_OK) {
uint8_t* res_iv =
(uint8_t*)res + sizeof(whMessageCrypto_AesCbcDmaResponse);
memcpy((uint8_t*)aes->reg, res_iv, AES_IV_SIZE);
WH_DEBUG_CLIENT_VERBOSE("AesCbc DMA res: ok\n");
/* Trailing payload is the updated IV (AES_IV_SIZE) */
const uint32_t hdr_sz =
sizeof(whMessageCrypto_GenericResponseHeader) + sizeof(*res) +
AES_IV_SIZE;
if (res_len < hdr_sz) {
ret = WH_ERROR_ABORTED;
}
else {
uint8_t* res_iv =
(uint8_t*)res + sizeof(whMessageCrypto_AesCbcDmaResponse);
memcpy((uint8_t*)aes->reg, res_iv, AES_IV_SIZE);
WH_DEBUG_CLIENT_VERBOSE("AesCbc DMA res: ok\n");
}
}
}

Expand Down Expand Up @@ -1759,19 +1784,27 @@ int wh_Client_AesGcmDmaResponse(whClientContext* ctx, Aes* aes,
if (ret == WH_ERROR_OK) {
ret = _getCryptoResponse(dataPtr, WC_CIPHER_AES_GCM, (uint8_t**)&res);
if (ret == WH_ERROR_OK) {
if (enc_tag != NULL && res->authTagSz > 0) {
if (res->authTagSz > tag_len) {
ret = WH_ERROR_ABORTED;
}
else {
uint8_t* res_tag =
(uint8_t*)res +
sizeof(whMessageCrypto_AesGcmDmaResponse);
memcpy(enc_tag, res_tag, res->authTagSz);
/* Trailing payload is the auth tag (res->authTagSz) */
const uint32_t hdr_sz =
sizeof(whMessageCrypto_GenericResponseHeader) + sizeof(*res);
if (res_len < hdr_sz || res->authTagSz > (res_len - hdr_sz)) {
ret = WH_ERROR_ABORTED;
}
else {
if (enc_tag != NULL && res->authTagSz > 0) {
if (res->authTagSz > tag_len) {
ret = WH_ERROR_ABORTED;
}
else {
uint8_t* res_tag =
(uint8_t*)res +
sizeof(whMessageCrypto_AesGcmDmaResponse);
memcpy(enc_tag, res_tag, res->authTagSz);
}
}
WH_DEBUG_CLIENT_VERBOSE("AesGcm DMA res: tagsz=%u\n",
(unsigned int)res->authTagSz);
}
WH_DEBUG_CLIENT_VERBOSE("AesGcm DMA res: tagsz=%u\n",
(unsigned int)res->authTagSz);
}
}

Expand Down
Loading
Loading