Skip to content

Commit 4a20401

Browse files
committed
Simplify entropy seed injection configuration
Move NVSEED callbacks configuration to a header file
1 parent 0622cc9 commit 4a20401

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

features/mbedtls/platform/inc/platform_mbed.h

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,20 @@
2121
#ifndef __PLATFORM_MBED__H__
2222
#define __PLATFORM_MBED__H__
2323

24-
#if defined(TARGET_PSA)
24+
#if (defined(TARGET_PSA) && defined(MBEDTLS_ENTROPY_NV_SEED))
25+
2526
#include "default_random_seed.h"
27+
28+
#if !defined(MBEDTLS_PLATFORM_NV_SEED_READ_MACRO)
29+
#define MBEDTLS_PLATFORM_NV_SEED_READ_MACRO mbed_default_seed_read
2630
#endif
2731

32+
#if !defined(MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO)
33+
#define MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO mbed_default_seed_write
34+
#endif
35+
36+
#endif // (defined(TARGET_PSA) && defined(MBEDTLS_ENTROPY_NV_SEED))
37+
2838
#if DEVICE_TRNG
2939
#define MBEDTLS_ENTROPY_HARDWARE_ALT
3040
#endif

targets/targets.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7904,9 +7904,7 @@
79047904
"PSOC6_DYNSRM_DISABLE=1",
79057905
"MBEDTLS_PSA_CRYPTO_SPM",
79067906
"MBEDTLS_PSA_CRYPTO_C",
7907-
"MBEDTLS_ENTROPY_NV_SEED",
7908-
"MBEDTLS_PLATFORM_NV_SEED_READ_MACRO=mbed_default_seed_read",
7909-
"MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO=mbed_default_seed_write"
7907+
"MBEDTLS_ENTROPY_NV_SEED"
79107908
],
79117909
"deliver_to_target": "FUTURE_SEQUANA_PSA",
79127910
"overrides": {

0 commit comments

Comments
 (0)