Skip to content

Commit

Permalink
Fix memtransport, move debug prints to utils
Browse files Browse the repository at this point in the history
  • Loading branch information
@billphipps
billphipps committed Aug 20, 2024
1 parent 686fb9c commit 8c1cd0f
Show file tree
Hide file tree
Showing 5 changed files with 191 additions and 51 deletions.
32 changes: 9 additions & 23 deletions src/wh_client_cryptocb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,21 @@
*
*/

#include <stdint.h>

/* Pick up compile-time configuration */
#include "wolfhsm/wh_settings.h"

#include "wolfhsm/wh_client.h"

#ifndef WOLFHSM_CFG_NO_CRYPTO

#include <stdint.h>

#include "wolfhsm/wh_common.h"
#include "wolfhsm/wh_error.h"
#include "wolfhsm/wh_utils.h"
#include "wolfhsm/wh_comm.h"
#include "wolfhsm/wh_packet.h"
#include "wolfhsm/wh_error.h"
#include "wolfhsm/wh_message.h"

#ifndef WOLFHSM_CFG_NO_CRYPTO
#include "wolfhsm/wh_client.h"

#include "wolfssl/wolfcrypt/settings.h"
#include "wolfssl/wolfcrypt/types.h"
Expand All @@ -45,23 +48,6 @@

#include "wolfhsm/wh_client_cryptocb.h"

#if defined(DEBUG_CRYPTOCB) || defined(DEBUG_CRYPTOCB_VERBOSE)
#include <stdio.h>
#endif

#ifdef DEBUG_CRYPTOCB_VERBOSE
static void _hexdump(const char* initial,uint8_t* ptr, size_t size)
{
if(initial != NULL)
printf("%s",initial);
while(size > 0) {
printf ("%02X ", *ptr);
ptr++;
size --;
}
printf("\n");
}
#endif

#ifndef NO_SHA256
static int _handleSha256(int devId, wc_CryptoInfo* info, void* inCtx,
Expand Down
15 changes: 9 additions & 6 deletions src/wh_server_crypto.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,31 @@
/* Pick up compile-time configuration */
#include "wolfhsm/wh_settings.h"

#ifndef WOLFHSM_CFG_NO_CRYPTO

/* System libraries */
#include <stdint.h>
#include <stddef.h> /* For NULL */
#include <string.h> /* For memset, memcpy */

#ifndef WOLFHSM_CFG_NO_CRYPTO

#include "wolfssl/wolfcrypt/settings.h"
#include "wolfssl/wolfcrypt/types.h"
#include "wolfssl/wolfcrypt/error-crypt.h"
#include "wolfssl/wolfcrypt/rsa.h"
#include "wolfssl/wolfcrypt/curve25519.h"
#include "wolfssl/wolfcrypt/ecc.h"
#include "wolfssl/wolfcrypt/aes.h"
#include "wolfssl/wolfcrypt/sha256.h"
#include "wolfssl/wolfcrypt/cmac.h"

#include "wolfhsm/wh_error.h"
#include "wolfhsm/wh_packet.h"
#include "wolfhsm/wh_utils.h"
#include "wolfhsm/wh_server_keystore.h"
#include "wolfhsm/wh_server_crypto.h"

#include "wolfhsm/wh_server.h"

#if defined(DEBUG_CRYPTOCB) || defined(DEBUG_CRYPTOCB_VERBOSE)
#include <stdio.h>
#endif

#ifndef NO_RSA
static int hsmCacheKeyRsa(whServerContext* server, RsaKey* key, whKeyId* outId)
{
Expand Down
78 changes: 56 additions & 22 deletions src/wh_transport_mem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include <stdint.h>

#include "wolfhsm/wh_error.h"
#include "wolfhsm/wh_utils.h"
#include "wolfhsm/wh_comm.h"

#include "wolfhsm/wh_transport_mem.h"
Expand All @@ -51,7 +52,7 @@ int wh_TransportMem_Init(void* c, const void* cf,
return WH_ERROR_BADARGS;
}

memset(context, 0, sizeof(*context));
wh_Utils_memset_flush(context, 0, sizeof(*context));
context->req = (whTransportMemCsr*)config->req;
context->req_size = config->req_size;
context->req_data = (void*)(context->req + 1);
Expand All @@ -61,6 +62,8 @@ int wh_TransportMem_Init(void* c, const void* cf,
context->resp_data = (void*)(context->resp + 1);

context->initialized = 1;
XMEMFENCE();

return WH_ERROR_OK;
}

Expand All @@ -72,8 +75,8 @@ int wh_TransportMem_InitClear(void* c, const void* cf,
int rc = wh_TransportMem_Init(c, cf, connectcb, connectcb_arg);
if (rc == WH_ERROR_OK) {
/* Zero the buffers */
memset((void*)context->req, 0, context->req_size);
memset((void*)context->resp, 0, context->resp_size);
wh_Utils_memset_flush((void*)context->req, 0, context->req_size);
wh_Utils_memset_flush((void*)context->resp, 0, context->resp_size);
}
return rc;
}
Expand All @@ -93,6 +96,8 @@ int wh_TransportMem_Cleanup(void* c)
int wh_TransportMem_SendRequest(void* c, uint16_t len, const void* data)
{
whTransportMemContext* context = c;
volatile whTransportMemCsr* ctx_req = context->req;
volatile whTransportMemCsr* ctx_resp = context->resp;
whTransportMemCsr resp;
whTransportMemCsr req;

Expand All @@ -101,30 +106,43 @@ int wh_TransportMem_SendRequest(void* c, uint16_t len, const void* data)
return WH_ERROR_BADARGS;
}

/* Read current CSR's */
resp.u64 = context->resp->u64;
req.u64 = context->req->u64;
/* Read current CSR's. ctx_req does not need to be invalidated */
XMEMFENCE();
XCACHEINVLD(ctx_resp);
XCACHEINVLD(ctx_req);

resp.u64 = ctx_resp->u64;
req.u64 = ctx_req->u64;

/* Has server completed with previous request */
if (req.s.notify != resp.s.notify) {
return WH_ERROR_NOTREADY;
}

if ((data != NULL) && (len != 0)) {
memcpy((void*)context->req_data, data, len);
wh_Utils_memcpy_flush((void*)context->req_data, data, len);
}

/* Ensure the memcpy is complete */
XMEMFENCE();

req.s.len = len;
req.s.notify++;

/* Write the new CSR's */
context->req->u64 = req.u64;
ctx_req->u64 = req.u64;
/*Ensure the update to the CSR is complete */
XMEMFENCE();
XCACHEFLUSH(ctx_req);

return 0;
}

int wh_TransportMem_RecvRequest(void* c, uint16_t *out_len, void* data)
{
whTransportMemContext* context = c;
volatile whTransportMemCsr* ctx_req = context->req;
volatile whTransportMemCsr* ctx_resp = context->resp;
whTransportMemCsr req;
whTransportMemCsr resp;

Expand All @@ -133,17 +151,19 @@ int wh_TransportMem_RecvRequest(void* c, uint16_t *out_len, void* data)
return WH_ERROR_BADARGS;
}

/* Read current request CSR's */
req.u64 = context->req->u64;
resp.u64 = context->resp->u64;
/* Read current request CSR's. ctx_resp does not need to be invalidated */
XMEMFENCE();
XCACHEINVLD(ctx_req);
req.u64 = ctx_req->u64;
resp.u64 = ctx_resp->u64;

/* Check to see if a new request has arrived */
if(req.s.notify == resp.s.notify) {
return WH_ERROR_NOTREADY;
}

if ((data != NULL) && (req.s.len != 0)) {
memcpy(data, context->req_data, req.s.len);
wh_Utils_memcpy_invalidate(data, context->req_data, req.s.len);
}
if (out_len != NULL) {
*out_len = req.s.len;
Expand All @@ -155,6 +175,8 @@ int wh_TransportMem_RecvRequest(void* c, uint16_t *out_len, void* data)
int wh_TransportMem_SendResponse(void* c, uint16_t len, const void* data)
{
whTransportMemContext* context = c;
volatile whTransportMemCsr* ctx_req = context->req;
volatile whTransportMemCsr* ctx_resp = context->resp;
whTransportMemCsr req;
whTransportMemCsr resp;

Expand All @@ -163,25 +185,35 @@ int wh_TransportMem_SendResponse(void* c, uint16_t len, const void* data)
return WH_ERROR_BADARGS;
}

/* Read both CSR's */
req.u64 = context->req->u64;
resp.u64 = context->resp->u64;
/* Read both CSR's. ctx_resp does not need to be invalidated */
XMEMFENCE();
XCACHEINVLD(ctx_req);
req.u64 = ctx_req->u64;
resp.u64 = ctx_resp->u64;

if ((data != NULL) && (len != 0)) {
memcpy(context->resp_data, data, len);
wh_Utils_memcpy_flush(context->resp_data, data, len);
}
/* Ensure the memcpy is complete */
XMEMFENCE();

resp.s.len = len;
resp.s.notify = req.s.notify;

/* Write the new CSR's */
context->resp->u64 = resp.u64;
/* Write the new CSR's */
ctx_resp->u64 = resp.u64;
/*Ensure the update to the CSR is complete */
XMEMFENCE();
XCACHEFLUSH(ctx_resp);

return 0;
}

int wh_TransportMem_RecvResponse(void* c, uint16_t *out_len, void* data)
{
whTransportMemContext* context = c;
volatile whTransportMemCsr* ctx_req = context->req;
volatile whTransportMemCsr* ctx_resp = context->resp;
whTransportMemCsr req;
whTransportMemCsr resp;

Expand All @@ -190,17 +222,19 @@ int wh_TransportMem_RecvResponse(void* c, uint16_t *out_len, void* data)
return WH_ERROR_BADARGS;
}

/* Read both CSR's */
req.u64 = context->req->u64;
resp.u64 = context->resp->u64;
/* Read both CSR's. ctx_req does not need to be invalidated */
XMEMFENCE();
XCACHEINVLD(ctx_resp);
req.u64 = ctx_req->u64;
resp.u64 = ctx_resp->u64;

/* Check to see if the current response is the different than the request */
if(resp.s.notify != req.s.notify) {
return WH_ERROR_NOTREADY;
}

if ((data != NULL) && (resp.s.len != 0)) {
memcpy(data, context->resp_data, resp.s.len);
wh_Utils_memcpy_invalidate(data, context->resp_data, resp.s.len);
}

if (out_len != NULL) {
Expand Down
70 changes: 70 additions & 0 deletions src/wh_utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
#include "wolfhsm/wh_settings.h"

#include <stdint.h>
#include <stddef.h> /* For size_t */
#include <string.h> /* For memset/cpy */

#include "wolfhsm/wh_utils.h"

Expand Down Expand Up @@ -84,3 +86,71 @@ int wh_Utils_memeqzero(uint8_t* buffer, uint32_t size)
}
return 1;
}

/** Cache helper functions */
const void* wh_Utils_CacheInvalidate(const void* p, size_t n)
{
int len = (int)n;
const uint8_t* ptr = (const uint8_t*)p;
do {
XCACHEINVLD(ptr);
ptr += XCACHELINE;
len -= XCACHELINE;
} while (len > 0);
return p;
}

void* wh_Utils_CacheFlush(void* p, size_t n)
{
int len = (int)n;
uint8_t* ptr = (uint8_t*)p;
do {
XCACHEFLUSH(ptr);
ptr += XCACHELINE;
len -= XCACHELINE;
} while (len > 0);
return p;
}

void* wh_Utils_memset_flush(void* p, int c, size_t n)
{
return wh_Utils_CacheFlush(memset(p, c, n), n);
}

void* wh_Utils_memcpy_invalidate(void* dst, const void* src, size_t n)
{
return memcpy(dst,wh_Utils_CacheInvalidate(src,n),n);
}

void* wh_Utils_memcpy_flush(void* dst, const void* src , size_t n)
{
return wh_Utils_CacheFlush(memcpy(dst,src,n),n);
}


#if defined(DEBUG_CRYPTOCB) || defined(DEBUG_CRYPTOCB_VERBOSE)
#include <stdio.h>
#endif

#ifdef DEBUG_CRYPTOCB_VERBOSE
void _hexdump(const char* initial, uint8_t* ptr, size_t size)
{
#define HEXDUMP_BYTES_PER_LINE 16
int count = 0;
if(initial != NULL)
printf("%s",initial);
while(size > 0) {
printf ("%02X ", *ptr);
ptr++;
size --;
count++;
if (count % HEXDUMP_BYTES_PER_LINE == 0) {
printf("\n");
}
}
if((count % HEXDUMP_BYTES_PER_LINE) != 0) {
printf("\n");
}
}
#endif

Loading

0 comments on commit 8c1cd0f

Please sign in to comment.