Keystore DMA functionality #85
Conversation
bigbrett
force-pushed
the
keystore-DMA
branch
from
2e3c50d to
5b2b07c
Compare
| return WH_ERROR_BADARGS; | ||
| } | ||
|
|
||
| packet = (whPacket*)wh_CommClient_GetDataPtr(c->comm); |
There was a problem hiding this comment.
| packet = (whPacket*)wh_CommClient_GetDataPtr(c->comm); | |
| packet = (whPacket*)wh_CommClient_GetDataPtr(c->comm); | |
| if (packet == NULL) { | |
| return WH_ERROR_BADARGS; | |
| } |
There was a problem hiding this comment.
Hmm I don't think it is possible for this to return NULL right now, and we don't have this check anywhere else. Might be superfluous?
| if (labelSz > WH_NVM_LABEL_LEN) { | ||
| memcpy(packet->keyCacheDma32Req.label, label, WH_NVM_LABEL_LEN); | ||
| } | ||
| else { | ||
| memcpy(packet->keyCacheDma32Req.label, label, labelSz); | ||
| } |
There was a problem hiding this comment.
| if (labelSz > WH_NVM_LABEL_LEN) { | |
| memcpy(packet->keyCacheDma32Req.label, label, WH_NVM_LABEL_LEN); | |
| } | |
| else { | |
| memcpy(packet->keyCacheDma32Req.label, label, labelSz); | |
| } | |
| if (labelSz > WH_NVM_LABEL_LEN) { | |
| labelSz = WH_NVM_LABEL_LEN; | |
| } | |
| memcpy(packet->keyCacheDma32Req.label, label, labelSz); |
| return WH_ERROR_BADARGS; | ||
| } | ||
|
|
||
| packet = (whPacket*)wh_CommClient_GetDataPtr(c->comm); |
There was a problem hiding this comment.
| packet = (whPacket*)wh_CommClient_GetDataPtr(c->comm); | |
| packet = (whPacket*)wh_CommClient_GetDataPtr(c->comm); | |
| if (packet == NULL) { | |
| return WH_ERROR_BADARGS; | |
| } |
There was a problem hiding this comment.
Hmm I don't think it is possible for this to return NULL right now, and we don't have this check anywhere else. Might be superfluous?
| @@ -58,6 +58,10 @@ enum WH_KEY_ENUM { | |||
| WH_KEY_EXPORT, | |||
| WH_KEY_COMMIT, | |||
| WH_KEY_ERASE, | |||
| WH_KEY_CACHE_DMA32, | |||
There was a problem hiding this comment.
Grumble. These should have been spelled like WH_MESSAGE_KEY_xxx. We should prolly fix all of them soon. No change now.
| int wh_Client_KeyExportDma32(whClientContext* c, uint16_t keyId, | ||
| uint32_t keyAddr, uint16_t keySz, uint8_t* label, | ||
| uint16_t labelSz, uint16_t* outSz); | ||
| #else |
There was a problem hiding this comment.
| #else | |
| #endif /* WH_DMA_IS_32BIT */ | |
| #ifdef WH_DMA_IS_64BIT | |
There was a problem hiding this comment.
postponing fix until we rip/replace all the DMA stuff like we talked about. This will still be present in #86.
| int wh_Client_KeyExportDma64(whClientContext* c, uint16_t keyId, | ||
| uint64_t keyAddr, uint16_t keySz, uint8_t* label, | ||
| uint16_t labelSz, uint16_t* outSz); | ||
| #endif /* WH_DMA_IS_32BIT */ |
There was a problem hiding this comment.
| #endif /* WH_DMA_IS_32BIT */ | |
| #endif /* WH_DMA_IS_64BIT */ |
There was a problem hiding this comment.
postponing fix until we rip/replace all the DMA stuff like we talked about. This will still be present in #86.
| #else | ||
| return wh_Client_KeyCacheDma64Response(c, keyId); | ||
| #endif |
There was a problem hiding this comment.
| #else | |
| return wh_Client_KeyCacheDma64Response(c, keyId); | |
| #endif | |
| #elseif defined(WH_DMA_IS_64BIT) | |
| return wh_Client_KeyCacheDma64Response(c, keyId); | |
| #else | |
| #error("Either WH_DMA_IS_32BIT or WH_DMA_IS_64BIT must be defined.") | |
| #endif |
There was a problem hiding this comment.
postponing fix until we rip/replace all the DMA stuff like we talked about. This will still be present in #86.
| } | ||
|
|
||
| /* Copy metadata */ | ||
| XMEMCPY(slotMeta, meta, sizeof(whNvmMetadata)); |
There was a problem hiding this comment.
consider memcpy/memset instead of the wc wrapper version in case nocrypto is set
Adds DMA capability for keystore operations that need to transmit keys (cache and export). Done in anticipation of PQC algorithms, which have larger key sizes.
A bit of a noisy diff, as I accidentally
clang-formattedsome code that I otherwise wouldn't have touched, but will be annoying to undo. I think it is still an improvement. You can turn off whitespace diff when looking at this PR to prevent that from being a distraction.