Skip to content

Commit 719669c

Browse files
committed
Address review comments
1 parent 6459473 commit 719669c

3 files changed

Lines changed: 195 additions & 251 deletions

File tree

src/wh_client.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -974,12 +974,10 @@ int wh_Client_KeyExportPublicResponse(whClientContext* c, uint8_t* label,
974974
*outSz = resp->len;
975975
}
976976
if ((ret == WH_ERROR_OK) && (label != NULL)) {
977-
if (labelSz > sizeof(resp->label)) {
978-
memcpy(label, resp->label, WH_NVM_LABEL_LEN);
979-
}
980-
else {
981-
memcpy(label, resp->label, labelSz);
977+
if (labelSz > WH_NVM_LABEL_LEN) {
978+
labelSz = WH_NVM_LABEL_LEN;
982979
}
980+
memcpy(label, resp->label, labelSz);
983981
}
984982
}
985983
}
@@ -1615,7 +1613,7 @@ int wh_Client_KeyExportDma(whClientContext* c, uint16_t keyId,
16151613
}
16161614

16171615
int wh_Client_KeyExportPublicDmaRequest(whClientContext* c, whKeyId keyId,
1618-
uint16_t algo, const void* keyAddr,
1616+
uint16_t algo, void* keyAddr,
16191617
uint16_t keySz)
16201618
{
16211619
whMessageKeystore_ExportPublicDmaRequest* req = NULL;
@@ -1663,9 +1661,7 @@ int wh_Client_KeyExportPublicDmaResponse(whClientContext* c, uint8_t* label,
16631661
rc = wh_Client_RecvResponse(c, &resp_group, &resp_action, &resp_size,
16641662
(uint8_t*)resp);
16651663
if (rc == 0) {
1666-
if ((resp_group != WH_MESSAGE_GROUP_KEY) ||
1667-
(resp_action != WH_KEY_EXPORT_PUBLIC_DMA) ||
1668-
(resp_size != sizeof(*resp))) {
1664+
if (resp_size != sizeof(*resp)) {
16691665
rc = WH_ERROR_ABORTED;
16701666
}
16711667
else {
@@ -1687,7 +1683,7 @@ int wh_Client_KeyExportPublicDmaResponse(whClientContext* c, uint8_t* label,
16871683
}
16881684

16891685
int wh_Client_KeyExportPublicDma(whClientContext* c, whKeyId keyId,
1690-
uint16_t algo, const void* keyAddr,
1686+
uint16_t algo, void* keyAddr,
16911687
uint16_t keySz, uint8_t* label,
16921688
uint16_t labelSz, uint16_t* outSz)
16931689
{

0 commit comments

Comments
 (0)