WolfSSL
/
wolfBoot
mirror of https://github.com/wolfSSL/wolfBoot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Preserve CRYPTOCELL_ENABLE; don't hardcode RNG FIFO depth

pull/651/head
Mattia Moffa 2025-12-15 17:29:00 +01:00
parent dd226cad0c
commit 26171affe0
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hal/nrf5340.c
View File

@ -180,8 +180,11 @@ static void hal_spu_init(void)
}
#ifdef WOLFCRYPT_SECURE_MODE
static uint32_t cryptocell_enable_prev = 0;
void hal_trng_init(void)
{
cryptocell_enable_prev = CRYPTOCELL_ENABLE;
CRYPTOCELL_ENABLE = 1;
CC_RNG_CLK = 1;
CC_RNG_SW_RESET = 1;
@ -201,9 +204,7 @@ void hal_trng_fini(void)
CC_RNG_CLK = 0;
CC_RNG_SW_RESET = 1;
/* TODO: it might be a bad idea to disable the whole CryptoCell engine in
* case other parts of it are used -- that is not the case right now */
CRYPTOCELL_ENABLE = 0;
CRYPTOCELL_ENABLE = cryptocell_enable_prev;
}
int hal_trng_get_entropy(unsigned char *out, unsigned int len)
@ -211,16 +212,16 @@ int hal_trng_get_entropy(unsigned char *out, unsigned int len)
unsigned int i = 0;
while (i < len) {
uint32_t data[6];
uint32_t data[CC_RNG_EHR_DATA_LEN];
uint8_t *data_bytes = (uint8_t *)data;
unsigned int word, byte;
while (!((CC_RNG_ISR & 0x01) && (CC_RNG_TRNG_VALID & 0x01))) {}
for (word = 0; word < 6; word++) {
for (word = 0; word < CC_RNG_EHR_DATA_LEN; word++) {
data[word] = CC_RNG_EHR_DATA(word);
}
for (byte = 0; byte < 24 && i < len; byte++) {
for (byte = 0; byte < 4 * CC_RNG_EHR_DATA_LEN && i < len; byte++) {
out[i++] = (unsigned char)data_bytes[byte];
}
}

1
hal/nrf5340.h
View File

@ -465,6 +465,7 @@ void uart_write_sz(const char* c, unsigned int sz);
#define CC_RNG_TRNG_CONFIG (*(volatile uint32_t *)(CC_RNG_BASE + 0x10C))
#define CC_RNG_TRNG_VALID (*(volatile uint32_t *)(CC_RNG_BASE + 0x110))
#define CC_RNG_EHR_DATA(n) (*(volatile uint32_t *)(CC_RNG_BASE + 0x114 + (n) * 0x4))
#define CC_RNG_EHR_DATA_LEN 6
#define CC_RNG_NOISE_SOURCE (*(volatile uint32_t *)(CC_RNG_BASE + 0x12C))
#define CC_RNG_SAMPLE_CNT (*(volatile uint32_t *)(CC_RNG_BASE + 0x130))
#define CC_RNG_AUTOCORR_STATISTIC (*(volatile uint32_t *)(CC_RNG_BASE + 0x134))