Skip to content

Commit

Permalink
use wc_AesCmacGenerate_ex where possible
Browse files Browse the repository at this point in the history
  • Loading branch information
@jpbland1
jpbland1 committed May 20, 2024
1 parent 9e15120 commit 9b6de43
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 66 deletions.
79 changes: 23 additions & 56 deletions src/wh_server_she.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,20 +355,13 @@ static int hsmSheLoadKey(whServerContext* server, whPacket* packet,
else
ret = WH_SHE_ERC_KEY_NOT_AVAILABLE;
/* cmac messageOne and messageTwo using K2 as the cmac key */
if (ret == 0) {
ret = wc_InitCmac_ex(sheCmac, tmpKey, WOLFHSM_SHE_KEY_SZ,
WC_CMAC_AES, NULL, NULL, server->crypto->devId);
}
/* hash M1 | M2 in one call */
if (ret == 0) {
ret = wc_CmacUpdate(sheCmac, (uint8_t*)&packet->sheLoadKeyReq,
sizeof(packet->sheLoadKeyReq.messageOne) +
sizeof(packet->sheLoadKeyReq.messageTwo));
}
/* get the digest */
if (ret == 0) {
field = AES_BLOCK_SIZE;
ret = wc_CmacFinal(sheCmac, cmacOutput, &field);
ret = wc_AesCmacGenerate_ex(sheCmac, cmacOutput, &field,
(uint8_t*)&packet->sheLoadKeyReq,
sizeof(packet->sheLoadKeyReq.messageOne) +
sizeof(packet->sheLoadKeyReq.messageTwo), tmpKey,
WOLFHSM_SHE_KEY_SZ, NULL, server->crypto->devId);
}
/* compare digest to M3 */
if (ret == 0 && XMEMCMP(packet->sheLoadKeyReq.messageThree,
Expand Down Expand Up @@ -508,20 +501,12 @@ static int hsmSheLoadKey(whServerContext* server, whPacket* packet,
meta->len + sizeof(WOLFHSM_SHE_KEY_UPDATE_MAC_C), tmpKey);
}
/* cmac messageFour using K4 as the cmac key */
if (ret == 0) {
ret = wc_InitCmac_ex(sheCmac, tmpKey, WOLFHSM_SHE_KEY_SZ,
WC_CMAC_AES, NULL, NULL, server->crypto->devId);
}
/* hash M4, store in M5 */
if (ret == 0) {
ret = wc_CmacUpdate(sheCmac, packet->sheLoadKeyRes.messageFour,
sizeof(packet->sheLoadKeyRes.messageFour));
}
/* write M5 */
if (ret == 0) {
field = AES_BLOCK_SIZE;
ret = wc_CmacFinal(sheCmac, packet->sheLoadKeyRes.messageFive,
&field);
ret = wc_AesCmacGenerate_ex(sheCmac, packet->sheLoadKeyRes.messageFive,
&field, packet->sheLoadKeyRes.messageFour,
sizeof(packet->sheLoadKeyRes.messageFour), tmpKey,
WOLFHSM_SHE_KEY_SZ, NULL, server->crypto->devId);
}
if (ret == 0) {
*size = WOLFHSM_PACKET_STUB_SIZE + sizeof(packet->sheLoadKeyRes);
Expand Down Expand Up @@ -627,23 +612,15 @@ static int hsmSheExportRamKey(whServerContext* server, whPacket* packet,
ret = wh_AesMp16(server, kdfInput,
meta->len + sizeof(WOLFHSM_SHE_KEY_UPDATE_MAC_C), tmpKey);
}
/* cmac messageOne and messageTwo using K2 as the cmac key */
if (ret == 0) {
/* cmac messageOne and messageTwo using K2 as the cmac key */
ret = wc_InitCmac_ex(sheCmac, tmpKey, WOLFHSM_SHE_KEY_SZ,
WC_CMAC_AES, NULL, NULL, server->crypto->devId);
}
/* hash M1 | M2 in one call */
if (ret == 0) {
ret = wc_CmacUpdate(sheCmac,
field = AES_BLOCK_SIZE;
ret = wc_AesCmacGenerate_ex(sheCmac,
packet->sheExportRamKeyRes.messageThree, &field,
(uint8_t*)&packet->sheExportRamKeyRes,
sizeof(packet->sheExportRamKeyRes.messageOne) +
sizeof(packet->sheExportRamKeyRes.messageTwo));
}
/* get the digest */
if (ret == 0) {
field = AES_BLOCK_SIZE;
ret = wc_CmacFinal(sheCmac,
packet->sheExportRamKeyRes.messageThree, &field);
sizeof(packet->sheExportRamKeyRes.messageTwo), tmpKey,
WOLFHSM_SHE_KEY_SZ, NULL, server->crypto->devId);
}
if (ret == 0) {
/* copy the ram key to kdfInput */
Expand Down Expand Up @@ -691,20 +668,13 @@ static int hsmSheExportRamKey(whServerContext* server, whPacket* packet,
WOLFHSM_SHE_KEY_SZ + sizeof(WOLFHSM_SHE_KEY_UPDATE_MAC_C), tmpKey);
}
/* cmac messageFour using K4 as the cmac key */
if (ret == 0) {
ret = wc_InitCmac_ex(sheCmac, tmpKey, WOLFHSM_SHE_KEY_SZ,
WC_CMAC_AES, NULL, NULL, server->crypto->devId);
}
/* hash M4, store in M5 */
if (ret == 0) {
ret = wc_CmacUpdate(sheCmac, packet->sheExportRamKeyRes.messageFour,
sizeof(packet->sheExportRamKeyRes.messageFour));
}
/* write M5 */
if (ret == 0) {
field = AES_BLOCK_SIZE;
ret = wc_CmacFinal(sheCmac, packet->sheExportRamKeyRes.messageFive,
&field);
ret = wc_AesCmacGenerate_ex(sheCmac,
packet->sheExportRamKeyRes.messageFive, &field,
packet->sheExportRamKeyRes.messageFour,
sizeof(packet->sheExportRamKeyRes.messageFour), tmpKey,
WOLFHSM_SHE_KEY_SZ, NULL, server->crypto->devId);
}
if (ret == 0)
*size = WOLFHSM_PACKET_STUB_SIZE + sizeof(packet->sheExportRamKeyRes);
Expand Down Expand Up @@ -1046,15 +1016,12 @@ static int hsmSheGenerateMac(whServerContext* server, whPacket* packet,
&keySz);
/* hash the message */
if (ret == 0) {
ret = wc_InitCmac_ex(sheCmac, tmpKey, WOLFHSM_SHE_KEY_SZ,
WC_CMAC_AES, NULL, NULL, server->crypto->devId);
ret = wc_AesCmacGenerate_ex(sheCmac, packet->sheGenMacRes.mac, &field,
in, packet->sheGenMacReq.sz, tmpKey, WOLFHSM_SHE_KEY_SZ, NULL,
server->crypto->devId);
}
else
ret = WH_SHE_ERC_KEY_NOT_AVAILABLE;
if (ret == 0)
ret = wc_CmacUpdate(sheCmac, in, packet->sheGenMacReq.sz);
if (ret == 0)
ret = wc_CmacFinal(sheCmac, packet->sheGenMacRes.mac, &field);
if (ret == 0)
*size = WOLFHSM_PACKET_STUB_SIZE + sizeof(packet->sheGenMacRes);
return ret;
Expand Down
13 changes: 3 additions & 10 deletions src/wh_she_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ int wh_SheGenerateLoadableKey(uint8_t keyId,
ret = wh_AesMp16(kdfInput,
WOLFHSM_SHE_KEY_SZ + sizeof(WOLFHSM_SHE_KEY_UPDATE_MAC_C), tmpKey);
}
/* cmac messageOne and messageTwo using K2 as the cmac key */
if (ret == 0) {
/* cmac messageOne and messageTwo using K2 as the cmac key */
ret = wc_InitCmac_ex(cmac, tmpKey, WOLFHSM_SHE_KEY_SZ,
WC_CMAC_AES, NULL, NULL, INVALID_DEVID);
}
Expand Down Expand Up @@ -206,17 +206,10 @@ int wh_SheGenerateLoadableKey(uint8_t keyId,
WOLFHSM_SHE_KEY_SZ + sizeof(WOLFHSM_SHE_KEY_UPDATE_MAC_C), tmpKey);
}
/* cmac messageFour using K4 as the cmac key */
if (ret == 0) {
ret = wc_InitCmac_ex(cmac, tmpKey, WOLFHSM_SHE_KEY_SZ, WC_CMAC_AES,
NULL, NULL, INVALID_DEVID);
}
/* hash M4, store in M5 */
if (ret == 0)
ret = wc_CmacUpdate(cmac, messageFour, WOLFHSM_SHE_M4_SZ);
/* write M5 */
if (ret == 0) {
field = AES_BLOCK_SIZE;
ret = wc_CmacFinal(cmac, messageFive, &field);
ret = wc_AesCmacGenerate_ex(cmac, messageFive, &field, messageFour,
WOLFHSM_SHE_M4_SZ, tmpKey, WOLFHSM_SHE_KEY_SZ, NULL, INVALID_DEVID);
}
return ret;
}

0 comments on commit 9b6de43

Please sign in to comment.