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

Merge pull request #10025 from kfnta/psoc6_trng_psa 

PSA: PSoC 6 Correct TRNG behaviour
pull/10030/head
Martin Kojtal 2019-03-11 10:34:41 +01:00 committed by GitHub
parent 5c79394756 d6863d89e7
commit e0c7e087de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
targets/TARGET_Cypress/TARGET_PSOC6/trng_api.c
View File

@ -19,6 +19,8 @@
#if DEVICE_TRNG
#if !(defined(TARGET_PSA) && defined(COMPONENT_NSPE))
#include "trng_api.h"
#include "psoc6_utils.h"
#include "cy_crypto_core_trng.h"
@ -70,4 +72,5 @@ int trng_get_bytes(trng_t *obj, uint8_t *output, size_t length, size_t *output_l
return (ret);
}
#endif // #if !(defined(TARGET_PSA) && defined(COMPONENT_NSPE))
#endif

3
targets/targets.json
View File

@ -8042,7 +8042,6 @@
"MBED_TICKLESS",
"MBEDTLS_PSA_CRYPTO_SPM",
"MBEDTLS_PSA_CRYPTO_C",
"MBEDTLS_ENTROPY_NV_SEED",
"CY_IPC_DEFAULT_CFG_DISABLE",
"PU_ENABLE"
],
@ -8067,7 +8066,7 @@
"inherits": ["NSPE_Target", "CY8CKIT_062_WIFI_BT"],
"extra_labels_add": ["PSA", "MBED_SPM"],
"components_add": ["SPM_MAILBOX", "FLASHIAP"],
"device_has_remove": ["TRNG", "CRC"],
"device_has_remove": ["CRC"],
"macros_add": ["MBEDTLS_PSA_CRYPTO_C"],
"hex_filename": "psa_release_1.0.hex",
"overrides": {