Skip to content

MAX32666 fixes for old SDK #10733

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
mattia-moffa wants to merge 2 commits into
base: master
Choose a base branch
from
+53 −17
Open

MAX32666 fixes for old SDK #10733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4252d0f
MAX32666 fixes for old SDK
mattia-moffa Jun 18, 2026
9ec65ed
Fix old SDK TRNG clock init, health-test and locking
mattia-moffa Jun 19, 2026
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
54 changes: 48 additions & 6 deletions wolfcrypt/src/port/maxim/max3266x.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,11 @@ int wc_MXC_TRNG_Random(unsigned char* output, unsigned int sz)
if (status != 0) {
return status;
}
#if defined(WOLFSSL_MAX3266X_OLD)
status = TRNG_Init(NULL);
#else
status = MXC_TPU_Init(MXC_SYS_PERIPH_CLOCK_TRNG);
#endif
if (status == 0) {
/* void return function */
MXC_TPU_TRNG_Read(MXC_TRNG, output, sz);
Expand All @@ -638,6 +642,38 @@ int wc_MXC_TRNG_Random(unsigned char* output, unsigned int sz)
wolfSSL_HwRngMutexUnLock(); /* Unlock Mutex no matter status value */
return status;
}

#if defined(WOLFSSL_MAX3266X_OLD)
/* Implements TRNG on-demand health test (the older SDK does not provide one) */
int wc_MXC_TRNG_HealthTest(void)
{
if (TRNG_Init(NULL) != 0) {
MAX3266X_MSG("TRNG Device did not initialize");
return RNG_FAILURE_E;
}

while ((MXC_TRNG->st & MXC_F_TRNG_ST_RND_RDY) == 0) {}

/* Clear on-going test if necessary */
if (MXC_TRNG->cn & MXC_F_TRNG_CN_ODHT) {
MXC_TRNG->cn &= ~MXC_F_TRNG_CN_ODHT;
while (MXC_TRNG->st & MXC_F_TRNG_ST_ODHTS) {}
}

/* Start on-demand health test */
MXC_TRNG->cn |= MXC_F_TRNG_CN_ODHT;

/* Wait for the test to finish */
while (MXC_TRNG->st & MXC_F_TRNG_ST_ODHTS) {}

/* Check results of test */
if (MXC_TRNG->st & MXC_F_TRNG_ST_HTS) {
MAX3266X_MSG("TRNG HW Health Test Failed");
return WC_HW_E;
}
return 0;
}
#endif /* WOLFSSL_MAX3266X_OLD */
#endif /* MAX3266X_RNG */

#if defined(MAX3266X_AES)
Expand Down Expand Up @@ -1051,6 +1087,12 @@ int wc_MXC_TPU_SHA_Final(unsigned char** msg, unsigned int* used,

/* TPU hash helpers (bare-metal SHA accelerator) */

#if defined(WOLFSSL_MAX3266X_OLD)
#define MXC_TPU_DATA_IN din
#else
#define MXC_TPU_DATA_IN data_in
#endif

/* Reset TPU, select hash function, and restore intermediate state into
* the HASH_DIGEST registers. */
void wc_MXC_TPU_Hash_Setup(MXC_TPU_HASH_TYPE algo,
Expand Down Expand Up @@ -1089,7 +1131,7 @@ void wc_MXC_TPU_Hash_Feed_Block(const unsigned char* data,

for (word = 0; word < blockSz; word += 4) {
while (!(MXC_TPU->ctrl & MXC_F_TPU_CTRL_RDY)) {}
MXC_TPU->data_in[0] = (unsigned int)data[word]
MXC_TPU->MXC_TPU_DATA_IN[0] = (unsigned int)data[word]
| ((unsigned int)data[word + 1] << 8)
| ((unsigned int)data[word + 2] << 16)
| ((unsigned int)data[word + 3] << 24);
Expand Down Expand Up @@ -1117,26 +1159,26 @@ void wc_MXC_TPU_Hash_Feed_Last(const unsigned char* data,
* trigger processing of the padding-only block. */
if (totalLenLo == 0 && totalLenHi == 0) {
while (!(MXC_TPU->ctrl & MXC_F_TPU_CTRL_RDY)) {}
MXC_TPU->data_in[0] = 0;
MXC_TPU->MXC_TPU_DATA_IN[0] = 0;
}

for (word = 0; word < dataLen; word += 4) {
while (!(MXC_TPU->ctrl & MXC_F_TPU_CTRL_RDY)) {}
if (dataLen >= (word + 4)) {
MXC_TPU->data_in[0] = (unsigned int)data[word]
MXC_TPU->MXC_TPU_DATA_IN[0] = (unsigned int)data[word]
| ((unsigned int)data[word + 1] << 8)
| ((unsigned int)data[word + 2] << 16)
| ((unsigned int)data[word + 3] << 24);
}
else if ((dataLen & 3) == 1) {
MXC_TPU->data_in[0] = (unsigned int)data[word];
MXC_TPU->MXC_TPU_DATA_IN[0] = (unsigned int)data[word];
}
else if ((dataLen & 3) == 2) {
MXC_TPU->data_in[0] = (unsigned int)data[word]
MXC_TPU->MXC_TPU_DATA_IN[0] = (unsigned int)data[word]
| ((unsigned int)data[word + 1] << 8);
}
else if ((dataLen & 3) == 3) {
MXC_TPU->data_in[0] = (unsigned int)data[word]
MXC_TPU->MXC_TPU_DATA_IN[0] = (unsigned int)data[word]
| ((unsigned int)data[word + 1] << 8)
| ((unsigned int)data[word + 2] << 16);
}
Expand Down
8 changes: 0 additions & 8 deletions wolfcrypt/src/random.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5193,30 +5193,22 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
#elif defined(MAX3266X_RNG)
int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
{
#ifdef WOLFSSL_MAX3266X
int status;
#endif /* WOLFSSL_MAX3266X */
static int initDone = 0;
(void)os;
if (initDone == 0) {
#ifdef WOLFSSL_MAX3266X
status = wolfSSL_HwRngMutexLock();
if (status != 0) {
return status;
}
#endif /* WOLFSSL_MAX3266X */
if(MXC_TRNG_HealthTest() != 0) {
#ifdef DEBUG_WOLFSSL
WOLFSSL_MSG("TRNG HW Health Test Failed");
#endif /* DEBUG_WOLFSSL */
#ifdef WOLFSSL_MAX3266X
wolfSSL_HwRngMutexUnLock();
#endif /* WOLFSSL_MAX3266X */
return WC_HW_E;
}
#ifdef WOLFSSL_MAX3266X
wolfSSL_HwRngMutexUnLock();
#endif /* WOLFSSL_MAX3266X */
initDone = 1;
}
return wc_MXC_TRNG_Random(output, sz);
Expand Down
8 changes: 5 additions & 3 deletions wolfssl/wolfcrypt/port/maxim/max3266x.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,7 @@
#if defined(MAX3266X_RNG)
#include "trng.h" /* Provides TRNG Drivers */
#define MXC_TPU_TRNG_Read TRNG_Read
#warning "TRNG Health Test not available in older Maxim SDK"
#define MXC_TRNG_HealthTest(...) 0
#define MXC_TRNG_HealthTest wc_MXC_TRNG_HealthTest
#endif
#if defined(MAX3266X_AES)
#include "cipher.h" /* Provides Drivers for AES */
Expand Down Expand Up @@ -152,7 +151,7 @@
#endif

/* TPU Functions */
#define MXC_TPU_Init SYS_TPU_Init
#define MXC_TPU_Init(clock) SYS_TPU_Init(NULL)
#define MXC_TPU_Shutdown SYS_TPU_Shutdown
#define MXC_SYS_PERIPH_CLOCK_TPU SYS_PERIPH_CLOCK_TPU

Expand Down Expand Up @@ -228,6 +227,9 @@
#ifdef MAX3266X_RNG
WOLFSSL_LOCAL int wc_MXC_TRNG_Random(unsigned char* output,
unsigned int sz);
#if defined(WOLFSSL_MAX3266X_OLD)
WOLFSSL_LOCAL int wc_MXC_TRNG_HealthTest(void);
#endif /* WOLFSSL_MAX3266X_OLD */
#endif

#ifdef MAX3266X_AES
Expand Down
Loading