Skip to content

Commit 763cb4c

Browse files
author
Alexander Zilberkant
committed
Revert "Enable entropy injection on PSA targets"
mbedtls performs selftest on all entropy sources. Enable injected source without proper entropy injection causes mbedtls selftest to fail. Application code can still enable entropy injection by adding the macros to mbed_app.json/mbed_lib.json This reverts commit 8c03e3e60d46da71708c4a0e4dacf46a0179d18d.
1 parent 435d944 commit 763cb4c

File tree

1 file changed

+4
-35
lines changed

1 file changed

+4
-35
lines changed

targets/targets.json

Lines changed: 4 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1451,14 +1451,7 @@
14511451
"PSA"
14521452
],
14531453
"is_disk_virtual": true,
1454-
"macros": [
1455-
"CPU_MK64FN1M0VMD12",
1456-
"FSL_RTOS_MBED",
1457-
"MBEDTLS_PSA_CRYPTO_C",
1458-
"MBEDTLS_ENTROPY_NV_SEED",
1459-
"MBEDTLS_PLATFORM_NV_SEED_READ_MACRO=mbed_default_seed_read",
1460-
"MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO=mbed_default_seed_write"
1461-
],
1454+
"macros": ["CPU_MK64FN1M0VMD12", "FSL_RTOS_MBED", "MBEDTLS_PSA_CRYPTO_C"],
14621455
"inherits": ["Target"],
14631456
"detect_code": ["0240"],
14641457
"device_has": [
@@ -1746,14 +1739,7 @@
17461739
"PSA"
17471740
],
17481741
"is_disk_virtual": true,
1749-
"macros": [
1750-
"CPU_MK66FN2M0VMD18",
1751-
"FSL_RTOS_MBED",
1752-
"MBEDTLS_PSA_CRYPTO_C",
1753-
"MBEDTLS_ENTROPY_NV_SEED",
1754-
"MBEDTLS_PLATFORM_NV_SEED_READ_MACRO=mbed_default_seed_read",
1755-
"MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO=mbed_default_seed_write"
1756-
],
1742+
"macros": ["CPU_MK66FN2M0VMD18", "FSL_RTOS_MBED"],
17571743
"inherits": ["Target"],
17581744
"detect_code": ["0311"],
17591745
"device_has": [
@@ -2429,14 +2415,7 @@
24292415
"macro_name": "CLOCK_SOURCE_USB"
24302416
}
24312417
},
2432-
"macros_add": [
2433-
"USB_STM_HAL",
2434-
"USBHOST_OTHER",
2435-
"MBEDTLS_PSA_CRYPTO_C",
2436-
"MBEDTLS_ENTROPY_NV_SEED",
2437-
"MBEDTLS_PLATFORM_NV_SEED_READ_MACRO=mbed_default_seed_read",
2438-
"MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO=mbed_default_seed_write"
2439-
],
2418+
"macros_add": ["USB_STM_HAL", "USBHOST_OTHER"],
24402419
"device_has_add": ["SERIAL_ASYNCH", "SERIAL_FC", "FLASH", "MPU"],
24412420
"release_versions": ["2", "5"],
24422421
"device_name": "STM32F411RE",
@@ -2685,11 +2664,7 @@
26852664
"components_add": ["FLASHIAP"],
26862665
"macros_add": [
26872666
"USB_STM_HAL",
2688-
"USBHOST_OTHER",
2689-
"MBEDTLS_PSA_CRYPTO_C",
2690-
"MBEDTLS_ENTROPY_NV_SEED",
2691-
"MBEDTLS_PLATFORM_NV_SEED_READ_MACRO=mbed_default_seed_read",
2692-
"MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO=mbed_default_seed_write"
2667+
"USBHOST_OTHER"
26932668
],
26942669
"device_has_add": [
26952670
"ANALOGOUT",
@@ -4209,12 +4184,6 @@
42094184
"device_has_remove": [],
42104185
"extra_labels_add": ["PSA"],
42114186
"components_add": ["FLASHIAP"],
4212-
"macros_add": [
4213-
"MBEDTLS_PSA_CRYPTO_C",
4214-
"MBEDTLS_ENTROPY_NV_SEED",
4215-
"MBEDTLS_PLATFORM_NV_SEED_READ_MACRO=mbed_default_seed_read",
4216-
"MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO=mbed_default_seed_write"
4217-
],
42184187
"config": {
42194188
"stdio_uart_tx_help": {
42204189
"help": "Value: D8(default) or D1"

0 commit comments

Comments
 (0)