Skip to content

cherry-picks of MBEDTLS_PSA_CRYPTO_C-related fixes #4031

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

Merged
rlubos merged 4 commits into from
May 5, 2026
Merged

cherry-picks of MBEDTLS_PSA_CRYPTO_C-related fixes #4031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd71731
[nrf noup] modules: mbedtls: do not always enable entropy on MBEDTLS_…
tomi-font Apr 30, 2026
0004b9d
[nrf fromlist] tests: lib: uuid: fix PSA Crypto configuration
tomi-font May 5, 2026
44ede7f
[nrf fromlist] lib: uuid: fix prerequisites for CONFIG_UUID_V5
tomi-font May 5, 2026
70926d1
[nrf fromlist] lib: uuid: link to mbedTLS only when CONFIG_MBEDTLS_BU…
tomi-font May 5, 2026
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
2 changes: 1 addition & 1 deletion lib/uuid/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

zephyr_sources_ifdef(CONFIG_UUID uuid.c)

zephyr_library_link_libraries_ifdef(CONFIG_UUID_V5 mbedTLS)
zephyr_library_link_libraries_ifdef(CONFIG_MBEDTLS_BUILTIN mbedTLS)
15 changes: 5 additions & 10 deletions lib/uuid/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,21 @@
#
# SPDX-License-Identifier: Apache-2.0

menu "Universally Unique Identifier (UUID)"

config UUID
bool "UUID support"
menuconfig UUID
bool "Universally Unique Identifier (UUID) library"
help
Enable use of the UUID library.

if UUID

config UUID_V4
bool "UUID version 4 generation support"
depends on UUID
depends on ENTROPY_GENERATOR
help
Enable generation of UUID v4.

config UUID_V5
bool "UUID version 5 generation support"
depends on UUID
depends on MBEDTLS
depends on MBEDTLS_PSA_CRYPTO_C
depends on PSA_WANT_ALG_SHA_1
# When TF-M is enabled, Mbed TLS's MD module (which is used to generate
# v5 UUIDs) will dispacth hash operations to TF-M. Unfortunately TF-M
Expand All @@ -32,10 +28,9 @@ config UUID_V5

config UUID_BASE64
bool "UUID Base64 support"
depends on UUID
depends on BASE64
help
Enable conversion functions to write UUIDs in base 64
formats.

endmenu
endif
5 changes: 3 additions & 2 deletions modules/mbedtls/Kconfig.tf-psa-crypto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,8 @@ config MBEDTLS_PKCS5_C
choice MBEDTLS_PSA_CRYPTO_RNG_SOURCE
prompt "PSA crypto random source"
depends on MBEDTLS_PSA_CRYPTO_C
default MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG if CSPRNG_ENABLED
default MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG if CSPRNG_ENABLED \
|| !PSA_CRYPTO_PROVIDER_MBEDTLS
default MBEDTLS_PSA_CRYPTO_LEGACY_RNG

config MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG
Expand Down Expand Up @@ -467,7 +468,7 @@ config MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG_ALLOW_NON_CSPRNG
config MBEDTLS_PSA_CRYPTO_C
bool "Platform Security Architecture cryptography API"
depends on !BUILD_WITH_TFM
select CSPRNG_NEEDED
select CSPRNG_NEEDED if PSA_CRYPTO_PROVIDER_MBEDTLS

config MBEDTLS_USE_PSA_CRYPTO
bool "Use PSA APIs instead of legacy MbedTLS when possible"
Expand Down
3 changes: 1 addition & 2 deletions tests/lib/uuid/testcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ tests:
libraries.uuid.base:
extra_configs:
- CONFIG_UUID_V5=y
- CONFIG_MBEDTLS=y
- CONFIG_MBEDTLS_PSA_CRYPTO_C=y
- CONFIG_PSA_CRYPTO=y
- CONFIG_PSA_WANT_ALG_SHA_1=y
- CONFIG_UUID_BASE64=y
- CONFIG_BASE64=y
Expand Down
Loading