Skip to content

Commit 39ea40f

Browse files
committed
psa: Avoid re-definition of MBEDTLS_PSA_CRYPTO_C
Mbed TLS now enables PSA APIs by default on all targets. It's not necessary to explicitly enable MBEDTLS_PSA_CRYPTO_C, as that can be gotten from the Mbed TLS config.h. However, many PSA targets depend on `-DMBEDTLS_PSA_CRYPTO_C` being defined by the Mbed OS json configuration system and are not yet properly including the Mbed TLS configuration; for these PSA targets, warnings may remain until this issue is fixed. Avoiding re-definition will eliminate warnings like the following, when building mbed-os-example-blinky: Compile [ 14.5%]: pal_client_api_empty_intf.c [Warning] pal_client_api_intf.h@35,0: "PSA_SUCCESS" redefined Compile [ 14.6%]: pal_client_api_intf.c Compile [ 14.7%]: DeviceKey.cpp Compile [ 14.9%]: pal_internal_trusted_storage_intf.c [Warning] pal_internal_trusted_storage_intf.c@45,9: 'psa_its_set' is deprecated: PS specific types should not be used [-Wdeprecated-declarations] Compile [ 15.3%]: val_attestation.c [Warning] client.h@40,0: "PSA_VERSION_NONE" redefined <..> Compile [ 33.3%]: asn1parse.c [Warning] config.h@2838,0: "MBEDTLS_PSA_CRYPTO_C" redefined Compile [ 33.5%]: aes.c [Warning] config.h@2838,0: "MBEDTLS_PSA_CRYPTO_C" redefined Compile [ 33.6%]: asn1write.c [Warning] config.h@2838,0: "MBEDTLS_PSA_CRYPTO_C" redefined Compile [ 33.7%]: psa_crypto.c [Warning] config.h@2838,0: "MBEDTLS_PSA_CRYPTO_C" redefined Compile [ 33.8%]: blowfish.c [Warning] config.h@2838,0: "MBEDTLS_PSA_CRYPTO_C" redefined Compile [ 33.9%]: camellia.c [Warning] config.h@2838,0: "MBEDTLS_PSA_CRYPTO_C" redefined Compile [ 34.0%]: base64.c [Warning] config.h@2838,0: "MBEDTLS_PSA_CRYPTO_C" redefined Compile [ 34.2%]: ccm.c [Warning] config.h@2838,0: "MBEDTLS_PSA_CRYPTO_C" redefined Compile [ 34.3%]: chacha20.c [Warning] config.h@2838,0: "MBEDTLS_PSA_CRYPTO_C" redefined Compile [ 34.4%]: chachapoly.c [Warning] config.h@2838,0: "MBEDTLS_PSA_CRYPTO_C" redefined Compile [ 34.5%]: cipher_wrap.c [Warning] config.h@2838,0: "MBEDTLS_PSA_CRYPTO_C" redefined Compile [ 34.6%]: cmac.c [Warning] config.h@2838,0: "MBEDTLS_PSA_CRYPTO_C" redefined Compile [ 34.7%]: cipher.c [Warning] config.h@2838,0: "MBEDTLS_PSA_CRYPTO_C" redefined Compile [ 34.9%]: bignum.c [Warning] config.h@2838,0: "MBEDTLS_PSA_CRYPTO_C" redefined Compile [ 35.0%]: des.c [Warning] config.h@2838,0: "MBEDTLS_PSA_CRYPTO_C" redefined Compile [ 35.1%]: dhm.c [Warning] config.h@2838,0: "MBEDTLS_PSA_CRYPTO_C" redefined Compile [ 35.2%]: ctr_drbg.c <..> Compile [ 70.9%]: EthernetInterface.cpp [Warning] config.h@2838,0: "MBEDTLS_PSA_CRYPTO_C" redefined Compile [ 71.0%]: InternetSocket.cpp Compile [ 71.1%]: L3IPInterface.cpp [Warning] config.h@2838,0: "MBEDTLS_PSA_CRYPTO_C" redefined Compile [ 71.2%]: NetworkInterface.cpp
1 parent 1470d06 commit 39ea40f

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

targets/targets.json

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1485,7 +1485,7 @@
14851485
"PSA"
14861486
],
14871487
"is_disk_virtual": true,
1488-
"macros": ["CPU_MK64FN1M0VMD12", "FSL_RTOS_MBED", "MBEDTLS_PSA_CRYPTO_C"],
1488+
"macros": ["CPU_MK64FN1M0VMD12", "FSL_RTOS_MBED"],
14891489
"inherits": ["Target"],
14901490
"detect_code": ["0240"],
14911491
"device_has": [
@@ -1773,7 +1773,7 @@
17731773
"PSA"
17741774
],
17751775
"is_disk_virtual": true,
1776-
"macros": ["CPU_MK66FN2M0VMD18", "FSL_RTOS_MBED", "MBEDTLS_PSA_CRYPTO_C"],
1776+
"macros": ["CPU_MK66FN2M0VMD18", "FSL_RTOS_MBED"],
17771777
"inherits": ["Target"],
17781778
"detect_code": ["0311"],
17791779
"device_has": [
@@ -2816,8 +2816,7 @@
28162816
"components_add": ["FLASHIAP"],
28172817
"macros_add": [
28182818
"USB_STM_HAL",
2819-
"USBHOST_OTHER",
2820-
"MBEDTLS_PSA_CRYPTO_C"
2819+
"USBHOST_OTHER"
28212820
],
28222821
"device_has_add": [
28232822
"ANALOGOUT",
@@ -4561,9 +4560,6 @@
45614560
"device_has_remove": [],
45624561
"extra_labels_add": ["PSA"],
45634562
"components_add": ["SD", "FLASHIAP"],
4564-
"macros_add": [
4565-
"MBEDTLS_PSA_CRYPTO_C"
4566-
],
45674563
"config": {
45684564
"stdio_uart_tx_help": {
45694565
"help": "Value: D8(default) or D1"
@@ -8649,7 +8645,7 @@
86498645
],
86508646
"device_name": "GD32F450ZI",
86518647
"detect_code": ["1702"],
8652-
"macros_add": ["GD32F450", "MBEDTLS_PSA_CRYPTO_C"],
8648+
"macros_add": ["GD32F450"],
86538649
"bootloader_supported": true,
86548650
"release_versions": ["5"],
86558651
"overrides": {

0 commit comments

Comments
 (0)