Skip to content

Commit 6b7a015

Browse files
committed
nrf_security: remove CONFIG_MBEDTLS_USE_PSA_CRYPTO
It has been removed with Mbed TLS 4.0 and is now assumed to be always on. At the same time adjust some default enablings. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
1 parent f2367b8 commit 6b7a015

21 files changed

Lines changed: 11 additions & 54 deletions

samples/crypto/psa_tls/boards/nrf5340dk_nrf5340_cpuapp_ns.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
CONFIG_NRF_ENABLE_ICACHE=n
7-
CONFIG_MBEDTLS_USE_PSA_CRYPTO=y
87
CONFIG_MBEDTLS_PSA_CRYPTO_C=y
98

109
CONFIG_PM_PARTITION_SIZE_TFM=0x60000

samples/crypto/psa_tls/boards/nrf54l15dk_nrf54l10_cpuapp_ns.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
CONFIG_NRF_ENABLE_ICACHE=n
7-
CONFIG_MBEDTLS_USE_PSA_CRYPTO=y
87
CONFIG_MBEDTLS_PSA_CRYPTO_C=y
98

109
# The ECDSA CA certificate is stored persistently with Protected Storage,

samples/crypto/psa_tls/boards/nrf54l15dk_nrf54l15_cpuapp_ns.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
CONFIG_NRF_ENABLE_ICACHE=n
7-
CONFIG_MBEDTLS_USE_PSA_CRYPTO=y
87
CONFIG_MBEDTLS_PSA_CRYPTO_C=y
98

109
# The ECDSA CA certificate is stored persistently with Protected Storage,

samples/crypto/psa_tls/boards/nrf54lv10dk_nrf54lv10_cpuapp_ns.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
CONFIG_NRF_ENABLE_ICACHE=n
7-
CONFIG_MBEDTLS_USE_PSA_CRYPTO=y
87
CONFIG_MBEDTLS_PSA_CRYPTO_C=y
98

109
# The ECDSA CA certificate is stored persistently with Protected Storage,

samples/crypto/psa_tls/boards/nrf7120dk_nrf7120_cpuapp_ns.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
6-
CONFIG_MBEDTLS_USE_PSA_CRYPTO=y
76
CONFIG_MBEDTLS_PSA_CRYPTO_C=y
87

98
# The ECDSA CA certificate is stored persistently with Protected Storage,

samples/crypto/psa_tls/boards/nrf9151dk_nrf9151_ns.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
CONFIG_NRF_ENABLE_ICACHE=n
7-
CONFIG_MBEDTLS_USE_PSA_CRYPTO=y
87
CONFIG_MBEDTLS_PSA_CRYPTO_C=y
98

109
CONFIG_NRF_MODEM_LIB=n

samples/crypto/psa_tls/boards/nrf9160dk_nrf9160_ns.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
CONFIG_NRF_ENABLE_ICACHE=n
7-
CONFIG_MBEDTLS_USE_PSA_CRYPTO=y
87
CONFIG_MBEDTLS_PSA_CRYPTO_C=y
98

109
CONFIG_NRF_MODEM_LIB=n

samples/crypto/psa_tls/boards/nrf9161dk_nrf9161_ns.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
66
CONFIG_NRF_ENABLE_ICACHE=n
7-
CONFIG_MBEDTLS_USE_PSA_CRYPTO=y
87
CONFIG_MBEDTLS_PSA_CRYPTO_C=y
98

109
CONFIG_NRF_MODEM_LIB=n

samples/crypto/psa_tls/src/main.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,10 @@ int main(void)
4242

4343
LOG_INF("PSA TLS app started");
4444

45-
#if defined(MBEDTLS_USE_PSA_CRYPTO)
4645
err = psa_crypto_init();
4746
if (err < 0) {
4847
return APP_ERROR;
4948
}
50-
#endif
5149

5250
err = tls_set_credentials();
5351
if (err < 0) {

samples/wifi/provisioning/softap/prj.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ CONFIG_MBEDTLS_HEAP_SIZE=49152
105105
# MBEDTLS_ERR_X509_INVALID_FORMAT (-0x2180).
106106
CONFIG_MBEDTLS_PEM_PARSE_C=y
107107

108-
# Embedded PEMs are ECDSA P-256 (prime256v1). With CONFIG_MBEDTLS_USE_PSA_CRYPTO, PSA must list
108+
# Embedded PEMs are ECDSA P-256 (prime256v1). PSA must list
109109
# secp256r1 and ECDSA/ECDH or mbedtls_x509_crt_parse() returns MBEDTLS_ERR_X509_INVALID_FORMAT
110110
# (-0x2180). TLS server ECDHE uses psa_generate_key() then psa_export_public_key() for the
111111
# ephemeral key; without PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE / EXPORT, those calls map to

0 commit comments

Comments
 (0)