feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #4033 from JacobBarthelmeh/CAAM

Browse Source 
set partition number on key import and use ocb address for free'ing d…
This commit is contained in:
David Garske
2021-05-13 09:39:36 -07:00
committed by GitHub
parent 44a9346305 311c929fe2
commit 263105abec
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wolfcrypt/src/ecc.c
View File

@ -8381,11 +8381,12 @@ int wc_ecc_import_private_key_ex(const byte* priv, word32 privSz,
WOLFSSL_MSG("Unable to get partition"); WOLFSSL_MSG("Unable to get partition");
return MEMORY_E; return MEMORY_E;
} }
key->partNum = part;
key->blackKey = (word32)vaddr;
if (caamWriteToPartition(vaddr, priv, privSz) != 0) if (caamWriteToPartition(vaddr, priv, privSz) != 0)
return WC_HW_E; return WC_HW_E;
key->blackKey = (word32)vaddr;
if (pub != NULL) { if (pub != NULL) {
/* +1 to account for x963 compressed bit */ /* +1 to account for x963 compressed bit */
if (caamWriteToPartition(vaddr + privSz, pub + 1, pubSz - 1) != 0) if (caamWriteToPartition(vaddr + privSz, pub + 1, pubSz - 1) != 0)

23
wolfcrypt/src/port/caam/caam_qnx.c
View File

@ -39,7 +39,7 @@ uintptr_t virtual_base = 0;
/* keep track of which ID memory belongs to so it can be free'd up */ /* keep track of which ID memory belongs to so it can be free'd up */
#define MAX_PART 7 #define MAX_PART 7
pthread_mutex_t sm_mutex; pthread_mutex_t sm_mutex;
int sm_ownerId[MAX_PART]; CAAM_ADDRESS sm_ownerId[MAX_PART];
/* variables for I/O of resource manager */ /* variables for I/O of resource manager */
resmgr_connect_funcs_t connect_funcs; resmgr_connect_funcs_t connect_funcs;
@ -501,7 +501,7 @@ static int doBLOB(resmgr_context_t *ctp, io_devctl_t *msg, unsigned int args[4],
* returns EOK on success * returns EOK on success
*/ */
static int doECDSA_KEYPAIR(resmgr_context_t *ctp, io_devctl_t *msg, unsigned int args[4], static int doECDSA_KEYPAIR(resmgr_context_t *ctp, io_devctl_t *msg, unsigned int args[4],
unsigned int idx) unsigned int idx, iofunc_ocb_t *ocb)
{ {
int ret; int ret;
DESCSTRUCT desc; DESCSTRUCT desc;
@ -528,7 +528,7 @@ static int doECDSA_KEYPAIR(resmgr_context_t *ctp, io_devctl_t *msg, unsigned int
/* claim ownership of a secure memory location */ /* claim ownership of a secure memory location */
pthread_mutex_lock(&sm_mutex); pthread_mutex_lock(&sm_mutex);
sm_ownerId[args[2]] = ctp->rcvid; sm_ownerId[args[2]] = (CAAM_ADDRESS)ocb;
pthread_mutex_unlock(&sm_mutex); pthread_mutex_unlock(&sm_mutex);
return EOK; return EOK;
@ -917,7 +917,7 @@ static int doFIFO_S(resmgr_context_t *ctp, io_devctl_t *msg,
* returns EOK on success * returns EOK on success
*/ */
static int doGET_PART(resmgr_context_t *ctp, io_devctl_t *msg, static int doGET_PART(resmgr_context_t *ctp, io_devctl_t *msg,
unsigned int args[4], unsigned int idx) unsigned int args[4], unsigned int idx, iofunc_ocb_t *ocb)
{ {
int partNumber; int partNumber;
int partSz; int partSz;
@ -936,7 +936,7 @@ static int doGET_PART(resmgr_context_t *ctp, io_devctl_t *msg,
resmgr_msgwritev(ctp, &out_iov, 1, sizeof(msg->o)); resmgr_msgwritev(ctp, &out_iov, 1, sizeof(msg->o));
pthread_mutex_lock(&sm_mutex); pthread_mutex_lock(&sm_mutex);
sm_ownerId[partNumber] = ctp->rcvid; sm_ownerId[partNumber] = (CAAM_ADDRESS)ocb;
pthread_mutex_unlock(&sm_mutex); pthread_mutex_unlock(&sm_mutex);
return EOK; return EOK;
} }
@ -1081,7 +1081,7 @@ int io_devctl (resmgr_context_t *ctp, io_devctl_t *msg, iofunc_ocb_t *ocb)
break; break;
case WC_CAAM_ECDSA_KEYPAIR: case WC_CAAM_ECDSA_KEYPAIR:
ret = doECDSA_KEYPAIR(ctp, msg, args, idx); ret = doECDSA_KEYPAIR(ctp, msg, args, idx, ocb);
break; break;
case WC_CAAM_ECDSA_VERIFY: case WC_CAAM_ECDSA_VERIFY:
@ -1101,14 +1101,14 @@ int io_devctl (resmgr_context_t *ctp, io_devctl_t *msg, iofunc_ocb_t *ocb)
break; break;
case WC_CAAM_GET_PART: case WC_CAAM_GET_PART:
ret = doGET_PART(ctp, msg, args, idx); ret = doGET_PART(ctp, msg, args, idx, ocb);
break; break;
case WC_CAAM_FREE_PART: case WC_CAAM_FREE_PART:
caamFreePart(args[0]); caamFreePart(args[0]);
pthread_mutex_lock(&sm_mutex); pthread_mutex_lock(&sm_mutex);
sm_ownerId[args[0]] = -1; sm_ownerId[args[0]] = 0;
pthread_mutex_unlock(&sm_mutex); pthread_mutex_unlock(&sm_mutex);
ret = EOK; ret = EOK;
break; break;
@ -1158,8 +1158,9 @@ int io_close_ocb(resmgr_context_t *ctp, void *reserved, RESMGR_OCB_T *ocb)
/* free up any dangling owned memory */ /* free up any dangling owned memory */
pthread_mutex_lock(&sm_mutex); pthread_mutex_lock(&sm_mutex);
for (i = 0; i < MAX_PART; i++) { for (i = 0; i < MAX_PART; i++) {
if (sm_ownerId[i] == ctp->rcvid) { if (sm_ownerId[i] == (CAAM_ADDRESS)ocb) {
sm_ownerId[i] = -1; sm_ownerId[i] = 0;
printf("found dangiling partition at index %d\n", i);
caamFreePart(i); caamFreePart(i);
} }
} }
@ -1240,7 +1241,7 @@ int main(int argc, char *argv[])
pthread_mutex_init(&sm_mutex, NULL); pthread_mutex_init(&sm_mutex, NULL);
for (i = 0; i < MAX_PART; i++) { for (i = 0; i < MAX_PART; i++) {
sm_ownerId[i] = -1; sm_ownerId[i] = 0;
} }
if (InitCAAM() != 0) { if (InitCAAM() != 0) {