Skip to content

ARM cryptoCell: improve (de)initialization logic #11266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
holtrop-wolfssl wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −22
Open

ARM cryptoCell: improve (de)initialization logic #11266

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 18 additions & 22 deletions wolfcrypt/src/port/arm/cryptoCell.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,69 +43,65 @@ CRYS_RND_State_t wc_rndState;
CRYS_RND_WorkBuff_t wc_rndWorkBuff;
SaSiRndGenerateVectWorkFunc_t wc_rndGenVectFunc = CRYS_RND_GenerateVector;

static word32 cc310_enableCount = 0;
static int cc310_initialized = 0;
Comment thread
holtrop-wolfssl marked this conversation as resolved.

static void cc310_enable(void)
{
cc310_enableCount++;

/* Enable the CC310 HW/IQ once*/

NRF_CRYPTOCELL->ENABLE = 1;
NVIC_EnableIRQ(CRYPTOCELL_IRQn);
}

static void cc310_disable(void)
{
cc310_enableCount--;

/* Disable HW/IRQ if no more users */
if (cc310_enableCount == 0) {
NRF_CRYPTOCELL->ENABLE = 0;
NVIC_DisableIRQ(CRYPTOCELL_IRQn);
}
NRF_CRYPTOCELL->ENABLE = 0;
NVIC_DisableIRQ(CRYPTOCELL_IRQn);
}
Comment thread
holtrop-wolfssl marked this conversation as resolved.

int cc310_Init(void)
{
int ret = 0;
static int initialized = 0;

if (!initialized) {
/* Enable the CC310 HW. */
if (!cc310_initialized) {
Comment thread
holtrop-wolfssl marked this conversation as resolved.
/* Enable the CC310 HW/IRQ once*/
cc310_enable();
Comment thread
holtrop-wolfssl marked this conversation as resolved.

/*Initialize the CC310 run-time library*/
ret = SaSi_LibInit();

if (ret != SA_SILIB_RET_OK) {
WOLFSSL_MSG("Error SaSi_LibInit");
cc310_disable();
return ret;
}

/* RNG CryptoCell CC310 */
ret = CRYS_RndInit(&wc_rndState, &wc_rndWorkBuff);
if (ret != CRYS_OK) {
WOLFSSL_MSG("Error CRYS_RndInit");
SaSi_LibFini();
cc310_disable();
return ret;
}
initialized = 1;
cc310_initialized = 1;
}
Comment thread
holtrop-wolfssl marked this conversation as resolved.
Comment thread
holtrop-wolfssl marked this conversation as resolved.
return ret;
}

void cc310_Free(void)
{
CRYSError_t crys_result;
if (cc310_initialized) {
Comment thread
holtrop-wolfssl marked this conversation as resolved.
Comment thread
holtrop-wolfssl marked this conversation as resolved.
CRYSError_t crys_result;

SaSi_LibFini();
crys_result = CRYS_RND_UnInstantiation(&wc_rndState);

crys_result = CRYS_RND_UnInstantiation(&wc_rndState);
if (crys_result != CRYS_OK) {
WOLFSSL_MSG("Error CRYS_RND_UnInstantiation");
}

if (crys_result != CRYS_OK) {
WOLFSSL_MSG("Error RYS_RND_UnInstantiation");
SaSi_LibFini();
cc310_disable();
cc310_initialized = 0;
}
Comment thread
holtrop-wolfssl marked this conversation as resolved.
Comment thread
holtrop-wolfssl marked this conversation as resolved.
cc310_disable();
}

int cc310_random_generate(byte* output, word32 size)
Expand Down
Loading