Skip to content

Commit fbca8e9

Browse files
committed
platform_mbed.h: Fix and align EXPERIMENTAL_API check
Some of the lines in `platform_mbed.h` only have `FEATURE_PSA` checked, which is always set for Mbed OS PSA targets but the PSA APIs are not actually available unless `FEATURE_EXPERIMENTAL_API` is also enabled. To fix this and improve readability, group all PSA-related lines and check both macros.
1 parent 8ce8719 commit fbca8e9

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

connectivity/mbedtls/platform/inc/platform_mbed.h

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
#ifndef __PLATFORM_MBED__H__
2222
#define __PLATFORM_MBED__H__
2323

24-
#if (defined(FEATURE_EXPERIMENTAL_API) && defined(FEATURE_PSA) && defined(MBEDTLS_ENTROPY_NV_SEED))
24+
#if defined(FEATURE_EXPERIMENTAL_API) && defined(FEATURE_PSA)
25+
26+
#if defined(MBEDTLS_ENTROPY_NV_SEED)
2527

2628
#include "default_random_seed.h"
2729

@@ -37,19 +39,8 @@
3739
* MBEDTLS_ENTROPY_NV_SEED is enabled. */
3840
#define MBEDTLS_PSA_INJECT_ENTROPY
3941

40-
#endif // (defined(FEATURE_PSA) && defined(MBEDTLS_ENTROPY_NV_SEED))
41-
42-
#if DEVICE_TRNG
43-
#if !defined(MBEDTLS_ENTROPY_HARDWARE_ALT)
44-
#define MBEDTLS_ENTROPY_HARDWARE_ALT
45-
#endif
46-
#endif
47-
48-
#if defined(MBEDTLS_CONFIG_HW_SUPPORT)
49-
#include "mbedtls_device.h"
50-
#endif
42+
#endif // defined(MBEDTLS_ENTROPY_NV_SEED)
5143

52-
#if defined(FEATURE_PSA)
5344
/* The following configurations are a needed for Mbed Crypto submodule.
5445
* They are related to the persistent key storage feature.
5546
*/
@@ -58,6 +49,17 @@
5849
#undef MBEDTLS_PSA_CRYPTO_STORAGE_FILE_C
5950

6051
#define MBEDTLS_ENTROPY_HARDWARE_ALT
52+
53+
#endif // defined(FEATURE_EXPERIMENTAL_API) && defined(FEATURE_PSA)
54+
55+
#if DEVICE_TRNG
56+
#if !defined(MBEDTLS_ENTROPY_HARDWARE_ALT)
57+
#define MBEDTLS_ENTROPY_HARDWARE_ALT
58+
#endif
59+
#endif
60+
61+
#if defined(MBEDTLS_CONFIG_HW_SUPPORT)
62+
#include "mbedtls_device.h"
6163
#endif
6264

6365
/*

0 commit comments

Comments
 (0)