ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
pull/9195/head
Alexander Zilberkant 2019-01-13 14:09:27 +02:00
parent 435d944dd0
commit 763cb4c157
1 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
targets/targets.json
View File

@ -1451,14 +1451,7 @@
"PSA" "PSA"
], ],
"is_disk_virtual": true, "is_disk_virtual": true,
"macros": [ "macros": ["CPU_MK64FN1M0VMD12", "FSL_RTOS_MBED", "MBEDTLS_PSA_CRYPTO_C"],
"CPU_MK64FN1M0VMD12",
"FSL_RTOS_MBED",
"MBEDTLS_PSA_CRYPTO_C",
"MBEDTLS_ENTROPY_NV_SEED",
"MBEDTLS_PLATFORM_NV_SEED_READ_MACRO=mbed_default_seed_read",
"MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO=mbed_default_seed_write"
],
"inherits": ["Target"], "inherits": ["Target"],
"detect_code": ["0240"], "detect_code": ["0240"],
"device_has": [ "device_has": [
@ -1746,14 +1739,7 @@
"PSA" "PSA"
], ],
"is_disk_virtual": true, "is_disk_virtual": true,
"macros": [ "macros": ["CPU_MK66FN2M0VMD18", "FSL_RTOS_MBED"],
"CPU_MK66FN2M0VMD18",
"FSL_RTOS_MBED",
"MBEDTLS_PSA_CRYPTO_C",
"MBEDTLS_ENTROPY_NV_SEED",
"MBEDTLS_PLATFORM_NV_SEED_READ_MACRO=mbed_default_seed_read",
"MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO=mbed_default_seed_write"
],
"inherits": ["Target"], "inherits": ["Target"],
"detect_code": ["0311"], "detect_code": ["0311"],
"device_has": [ "device_has": [
@ -2429,14 +2415,7 @@
"macro_name": "CLOCK_SOURCE_USB" "macro_name": "CLOCK_SOURCE_USB"
} }
}, },
"macros_add": [ "macros_add": ["USB_STM_HAL", "USBHOST_OTHER"],
"USB_STM_HAL",
"USBHOST_OTHER",
"MBEDTLS_PSA_CRYPTO_C",
"MBEDTLS_ENTROPY_NV_SEED",
"MBEDTLS_PLATFORM_NV_SEED_READ_MACRO=mbed_default_seed_read",
"MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO=mbed_default_seed_write"
],
"device_has_add": ["SERIAL_ASYNCH", "SERIAL_FC", "FLASH", "MPU"], "device_has_add": ["SERIAL_ASYNCH", "SERIAL_FC", "FLASH", "MPU"],
"release_versions": ["2", "5"], "release_versions": ["2", "5"],
"device_name": "STM32F411RE", "device_name": "STM32F411RE",
@ -2685,11 +2664,7 @@
"components_add": ["FLASHIAP"], "components_add": ["FLASHIAP"],
"macros_add": [ "macros_add": [
"USB_STM_HAL", "USB_STM_HAL",
"USBHOST_OTHER", "USBHOST_OTHER"
"MBEDTLS_PSA_CRYPTO_C",
"MBEDTLS_ENTROPY_NV_SEED",
"MBEDTLS_PLATFORM_NV_SEED_READ_MACRO=mbed_default_seed_read",
"MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO=mbed_default_seed_write"
], ],
"device_has_add": [ "device_has_add": [
"ANALOGOUT", "ANALOGOUT",
@ -4209,12 +4184,6 @@
"device_has_remove": [], "device_has_remove": [],
"extra_labels_add": ["PSA"], "extra_labels_add": ["PSA"],
"components_add": ["FLASHIAP"], "components_add": ["FLASHIAP"],
"macros_add": [
"MBEDTLS_PSA_CRYPTO_C",
"MBEDTLS_ENTROPY_NV_SEED",
"MBEDTLS_PLATFORM_NV_SEED_READ_MACRO=mbed_default_seed_read",
"MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO=mbed_default_seed_write"
],
"config": { "config": {
"stdio_uart_tx_help": { "stdio_uart_tx_help": {
"help": "Value: D8(default) or D1" "help": "Value: D8(default) or D1"