Skip to content

Commit 081b349

Browse files
Frauschijulek-wolfssl
authored andcommitted
Zephyr: improve order of random seed sources
When using Zephyr, we also want to use the proper wc_GenerateSeed method. However, if one of the defines is set (e.g., NO_STM32_RNG), the Zephyr option is ignored, although it would work. Hence, we have to change the order in which these settings for the source of a random seed are evaluated. Signed-off-by: Tobias Frauenschläger <t.frauenschlaeger@me.com>
1 parent 182eaa0 commit 081b349

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

wolfcrypt/src/random.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3506,20 +3506,6 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
35063506
* extern int myRngFunc(byte* output, word32 sz);
35073507
*/
35083508

3509-
#elif defined(WOLFSSL_SAFERTOS) || defined(WOLFSSL_LEANPSK) || \
3510-
defined(WOLFSSL_IAR_ARM) || defined(WOLFSSL_MDK_ARM) || \
3511-
defined(WOLFSSL_uITRON4) || defined(WOLFSSL_uTKERNEL2) || \
3512-
defined(WOLFSSL_LPC43xx) || defined(NO_STM32_RNG) || \
3513-
defined(MBED) || defined(WOLFSSL_EMBOS) || \
3514-
defined(WOLFSSL_GENSEED_FORTEST) || defined(WOLFSSL_CHIBIOS) || \
3515-
defined(WOLFSSL_CONTIKI) || defined(WOLFSSL_AZSPHERE)
3516-
3517-
/* these platforms do not have a default random seed and
3518-
you'll need to implement your own wc_GenerateSeed or define via
3519-
CUSTOM_RAND_GENERATE_BLOCK */
3520-
3521-
#define USE_TEST_GENSEED
3522-
35233509
#elif defined(WOLFSSL_ZEPHYR)
35243510

35253511
#include <version.h>
@@ -3630,6 +3616,20 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
36303616
return ret;
36313617
}
36323618

3619+
#elif defined(WOLFSSL_SAFERTOS) || defined(WOLFSSL_LEANPSK) || \
3620+
defined(WOLFSSL_IAR_ARM) || defined(WOLFSSL_MDK_ARM) || \
3621+
defined(WOLFSSL_uITRON4) || defined(WOLFSSL_uTKERNEL2) || \
3622+
defined(WOLFSSL_LPC43xx) || defined(NO_STM32_RNG) || \
3623+
defined(MBED) || defined(WOLFSSL_EMBOS) || \
3624+
defined(WOLFSSL_GENSEED_FORTEST) || defined(WOLFSSL_CHIBIOS) || \
3625+
defined(WOLFSSL_CONTIKI) || defined(WOLFSSL_AZSPHERE)
3626+
3627+
/* these platforms do not have a default random seed and
3628+
you'll need to implement your own wc_GenerateSeed or define via
3629+
CUSTOM_RAND_GENERATE_BLOCK */
3630+
3631+
#define USE_TEST_GENSEED
3632+
36333633
#elif defined(NO_DEV_RANDOM)
36343634

36353635
#error "you need to write an os specific wc_GenerateSeed() here"

0 commit comments

Comments
 (0)