Skip to content

manifest: sdk-zephyr: [nrf fromtree] bluetooth: mesh: use new Kconfig CONFIG_PSA_CRYPTO #25259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

manifest: sdk-zephyr: [nrf fromtree] bluetooth: mesh: use new Kconfig CONFIG_PSA_CRYPTO #25259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca8b977
manifest: Update sdk-zephyr revision (auto-manifest PR)
NordicBuilder Oct 27, 2025
52185f7
bluetooth: mesh: Update PSA crypto configuration
Vge0rge Oct 27, 2025
600d966
nrf: Kconfig: Remove unused NRF_SECURITY_ENABLER
Vge0rge Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions Kconfig.nrf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,6 @@ config FLASH_SIZE
default 2036 if SOC_NRF54LM20A_ENGA_CPUFLPR
default 128 if SOC_NRF7120_ENGA_CPUFLPR

config NRF_SECURITY_ENABLER
def_bool y
imply NRF_SECURITY if BT_CRYPTO || BT_HOST_CRYPTO || BT_MESH_USES_MBEDTLS_PSA || BT_FAST_PAIR_CRYPTO_PSA
imply ENTROPY_GENERATOR if BOARD_NATIVE_SIM || BT_HOST_CRYPTO_PRNG || BT_ECC || BT_GATT_CACHING
imply PSA_WANT_GENERATE_RANDOM if BT_HOST_CRYPTO_PRNG || BT_ECC || BT_GATT_CACHING
imply MBEDTLS_ENABLE_HEAP if BT_HOST_CRYPTO_PRNG || BT_ECC || BT_GATT_CACHING || BT_CRYPTO
depends on !SOC_NRF5340_CPUNET

if SOC_SERIES_BSIM_NRFXX && ENTROPY_GENERATOR
config MBEDTLS_HEAP_SIZE
int
Expand Down
2 changes: 1 addition & 1 deletion subsys/bluetooth/mesh/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,6 @@ zephyr_library_sources_ifdef(CONFIG_BT_MESH_RPL_STORAGE_MODE_EMDS rpl.c)

zephyr_library_sources_ifdef(CONFIG_BT_MESH_KEY_IMPORTER key_importer.c)

if(CONFIG_BT_MESH_USES_MBEDTLS_PSA AND (NOT CONFIG_SOC_FAMILY_NORDIC_NRF))
if(CONFIG_PSA_CRYPTO_PROVIDER_MBEDTLS AND (NOT CONFIG_SOC_FAMILY_NORDIC_NRF))
zephyr_library_link_libraries(mbedTLS)
endif()
5 changes: 4 additions & 1 deletion subsys/bluetooth/mesh/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ config BT_MESH_ADV_STACK_SIZE

endif # SOC_SERIES_NRF54LX

if BT_MESH_USES_MBEDTLS_PSA
if BT_MESH_CRYPTO_LIB

if !BUILD_WITH_TFM

config BT_MESH_MBEDTLS_BACKEND_ENABLE
bool
Expand All @@ -37,6 +39,7 @@ config MBEDTLS_HEAP_SIZE
default 2048 if BT_MESH_DFD_SRV
default 1152 if BT_MESH_NLC_PERF_BASELINE
default 1024
endif # !BUILD_WITH_TFM

if BT_SETTINGS

Expand Down
2 changes: 1 addition & 1 deletion tests/subsys/bluetooth/mesh/light_ctrl/boards/native_sim.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Enforcing usage of built-in Mbed TLS for native simulator.
CONFIG_MBEDTLS=y
CONFIG_MBEDTLS_BUILTIN=y
CONFIG_BT_MESH_USES_MBEDTLS_PSA=y
CONFIG_PSA_CRYPTO_PROVIDER_MBEDTLS=y
2 changes: 1 addition & 1 deletion tests/subsys/bluetooth/mesh/light_hue/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ target_compile_options(app
-DCONFIG_BT_MESH_MOD_ACKD_TIMEOUT_BASE=3000
-DCONFIG_BT_MESH_MOD_ACKD_TIMEOUT_PER_HOP=50
-DCONFIG_BT_LOG_LEVEL=0
-DCONFIG_BT_MESH_USES_MBEDTLS_PSA=1
-DCONFIG_PSA_CRYPTO_PROVIDER_MBEDTLS=1
)

zephyr_ld_options(
Expand Down
2 changes: 1 addition & 1 deletion tests/subsys/bluetooth/mesh/light_hue/boards/native_sim.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Enforcing usage of built-in Mbed TLS for native simulator.
CONFIG_MBEDTLS=y
CONFIG_MBEDTLS_BUILTIN=y
CONFIG_BT_MESH_USES_MBEDTLS_PSA=y
CONFIG_PSA_CRYPTO_PROVIDER_MBEDTLS=y
2 changes: 1 addition & 1 deletion tests/subsys/bluetooth/mesh/scheduler_model/action_planning/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ target_compile_options(app
-DCONFIG_BT_MESH_MODEL_LOG_LEVEL=0
-DCONFIG_BT_MESH_MOD_ACKD_TIMEOUT_BASE=0
-DCONFIG_BT_MESH_MOD_ACKD_TIMEOUT_PER_HOP=0
-DCONFIG_BT_MESH_USES_MBEDTLS_PSA=1
-DCONFIG_PSA_CRYPTO_PROVIDER_MBEDTLS=1
)

zephyr_ld_options(
Expand Down
2 changes: 1 addition & 1 deletion tests/subsys/bluetooth/mesh/scheduler_model/action_planning/boards/native_sim.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Enforcing usage of built-in Mbed TLS for native simulator.
CONFIG_MBEDTLS=y
CONFIG_MBEDTLS_BUILTIN=y
CONFIG_BT_MESH_USES_MBEDTLS_PSA=y
CONFIG_PSA_CRYPTO_PROVIDER_MBEDTLS=y
2 changes: 1 addition & 1 deletion tests/subsys/bluetooth/mesh/scheduler_model/message_validity/boards/native_sim.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Enforcing usage of built-in Mbed TLS for native simulator.
CONFIG_MBEDTLS=y
CONFIG_MBEDTLS_BUILTIN=y
CONFIG_BT_MESH_USES_MBEDTLS_PSA=y
CONFIG_PSA_CRYPTO_PROVIDER_MBEDTLS=y
2 changes: 1 addition & 1 deletion tests/subsys/bluetooth/mesh/scheduler_model/timing/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ target_compile_options(app
-DCONFIG_BT_MESH_MODEL_GROUP_COUNT=5
-DCONFIG_BT_LOG_LEVEL=0
-DCONFIG_BT_MESH_SCHEDULER_SRV=1
-DCONFIG_BT_MESH_USES_MBEDTLS_PSA=1
-DCONFIG_PSA_CRYPTO_PROVIDER_MBEDTLS=1
)

zephyr_ld_options(
Expand Down
2 changes: 1 addition & 1 deletion tests/subsys/bluetooth/mesh/scheduler_model/timing/boards/native_sim.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Enforcing usage of built-in Mbed TLS for native simulator.
CONFIG_MBEDTLS=y
CONFIG_MBEDTLS_BUILTIN=y
CONFIG_BT_MESH_USES_MBEDTLS_PSA=y
CONFIG_PSA_CRYPTO_PROVIDER_MBEDTLS=y
2 changes: 1 addition & 1 deletion tests/subsys/bluetooth/mesh/sensor_subsys/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ target_compile_options(app
-DCONFIG_BT_MESH_SENSOR_CHANNELS_MAX=5
-DCONFIG_BT_MESH_SENSOR_CHANNEL_ENCODED_SIZE_MAX=4
-DCONFIG_BT_LOG_LEVEL=0
-DCONFIG_BT_MESH_USES_MBEDTLS_PSA=1
-DCONFIG_PSA_CRYPTO_PROVIDER_MBEDTLS=1
)

zephyr_linker_sources(SECTIONS sensor_types.ld)
2 changes: 1 addition & 1 deletion tests/subsys/bluetooth/mesh/sensor_subsys/boards/native_sim.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Enforcing usage of built-in Mbed TLS for native simulator.
CONFIG_MBEDTLS=y
CONFIG_MBEDTLS_BUILTIN=y
CONFIG_BT_MESH_USES_MBEDTLS_PSA=y
CONFIG_PSA_CRYPTO_PROVIDER_MBEDTLS=y
2 changes: 1 addition & 1 deletion tests/subsys/bluetooth/mesh/silvair_enocean_model/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ target_compile_options(app
-DCONFIG_BT_MESH_SILVAIR_ENOCEAN_AUTO_COMMISSION=1
-DCONFIG_BT_MESH_MODEL_KEY_COUNT=1
-DCONFIG_BT_MESH_MODEL_GROUP_COUNT=1
-DCONFIG_BT_MESH_USES_MBEDTLS_PSA=1
-DCONFIG_PSA_CRYPTO_PROVIDER_MBEDTLS=1
)

zephyr_ld_options(
Expand Down
2 changes: 1 addition & 1 deletion tests/subsys/bluetooth/mesh/silvair_enocean_model/boards/native_sim.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Enforcing usage of built-in Mbed TLS for native simulator.
CONFIG_MBEDTLS=y
CONFIG_MBEDTLS_BUILTIN=y
CONFIG_BT_MESH_USES_MBEDTLS_PSA=y
CONFIG_PSA_CRYPTO_PROVIDER_MBEDTLS=y
2 changes: 1 addition & 1 deletion tests/subsys/bluetooth/mesh/time_model/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ target_compile_options(app
-DCONFIG_BT_MESH_TIME_SRV=1
-DCONFIG_BT_MESH_TIME_SRV_CLOCK_ACCURACY=500
-DCONFIG_BT_MESH_TIME_MESH_HOP_UNCERTAINTY=30
-DCONFIG_BT_MESH_USES_MBEDTLS_PSA=1
-DCONFIG_PSA_CRYPTO_PROVIDER_MBEDTLS=1
)

zephyr_ld_options(
Expand Down
2 changes: 1 addition & 1 deletion tests/subsys/bluetooth/mesh/time_model/boards/native_sim.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Enforcing usage of built-in Mbed TLS for native simulator.
CONFIG_MBEDTLS=y
CONFIG_MBEDTLS_BUILTIN=y
CONFIG_BT_MESH_USES_MBEDTLS_PSA=y
CONFIG_PSA_CRYPTO_PROVIDER_MBEDTLS=y
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 81edaae95618fa845f67957037fe22bc8b063a84
revision: pull/3431/head
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading