cherry-picks of MBEDTLS_PSA_CRYPTO_C-related fixes#4031
Merged
rlubos merged 4 commits intoMay 5, 2026
Conversation
tomi-font
force-pushed
the
fromlist_mbedtls_psa_crypto_c_custom_rng
branch
from
bc259f6 to
ab57421
Compare
tomi-font
changed the title
NordicBuilder
added a commit
to NordicBuilder/sdk-nrf
that referenced
this pull request
Apr 30, 2026
Automatically created by action-manifest-pr GH action from PR: nrfconnect/sdk-zephyr#4031 Signed-off-by: Nordic Builder <pylon@nordicsemi.no>
degjorva
approved these changes
May 4, 2026
MarekPieta
approved these changes
May 4, 2026
…PSA_CRYPTO_C This is actually a fromtree of upstream PR # 108256 (commit 21e55f2) but the cherry-pick conflicts too badly. This will be reverted and cherry-picked properly from upstream in the Mbed TLS update PR. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
The standard way to enable PSA Crypto is to enable CONFIG_PSA_CRYPTO and not CONFIG_MBEDTLS_PSA_CRYPTO_C directly. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no> Upstream PR #: 108469
It should not depend on CONFIG_MBEDTLS nor CONFIG_MBEDTLS_PSA_CRYPTO_C as a PSA Crypto provider other than Mbed TLS may be enabled. In fact, it doesn't even need to depend on CONFIG_PSA_CRYPTO because CONFIG_PSA_WANT_ALG_SHA_1 is already guarded behind CONFIG_PSA_CRYPTO_CLIENT. At the same time, replace all the `depends on UUID` by a single if which is the standard way to do. Also turn CONFIG_UUID into a menuconfig instead of creating a menu manually. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no> Upstream PR #: 108469
…ILTIN Otherwise the CMake library may not exist and the linker command would wrongfully get populated with `-lmbedTLS`. Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no> Upstream PR #: 108469
tomi-font
force-pushed
the
fromlist_mbedtls_psa_crypto_c_custom_rng
branch
from
ab57421 to
70926d1
Compare
tomi-font
changed the title
MBEDTLS_PSA_CRYPTO_C-related fixes cherry-picks
tomi-font
changed the title
MBEDTLS_PSA_CRYPTO_C-related fixes cherry-picksMBEDTLS_PSA_CRYPTO_C fixes cherry-picks
tomi-font
changed the title
MBEDTLS_PSA_CRYPTO_C fixes cherry-picksMBEDTLS_PSA_CRYPTO_C-related fixes
MarekPieta
approved these changes
May 5, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The noup is actually a fromtree of upstream commit
21e55f26e244e7d95fd0a918090e01f1fcd69fc4(PR # 108256) but the cherry-pick conflicts too badly. It is reverted and cherry-picked properly from upstream in the Mbed TLS update PR: #4039manifest-pr-skip