Skip to content
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.

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

zephyr: Fix usage of CONFIG_MBEDTLS_BUILTIN and ASN1 #2186

Merged

Conversation

de-nordic
Copy link
Collaborator

@de-nordic de-nordic commented Jan 22, 2025

This commit fixes issue where even if Zephyr provided mbedTLS module was used, ASN1 decoding procedures have been taken from MCUboot own version of mbedTLS extracted sources for these functions.

To be able to do that this commit changes config file used with mbedTLS with the one provided from Zephyr (the generic one), which allows to select required mbedTLS features via Kconfig options exposed by Zephyr.

Depends on zephyrproject-rtos/zephyr#84390

@de-nordic de-nordic requested a review from nordicjm as a code owner January 22, 2025 16:15
@de-nordic de-nordic added area: zephyr Affects the Zephyr port crypto Encryption support labels Jan 22, 2025
@de-nordic de-nordic requested a review from nvlsianpu January 22, 2025 16:15
@de-nordic de-nordic force-pushed the zephyr-mcuboot-use-generic-config branch from 92d5323 to a29d7f8 Compare January 22, 2025 16:27
Copy link
Collaborator

@nordicjm nordicjm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor nit. changes OK

Comment on lines 29 to 30
set(MBEDTLS_ASN1_DIR "${MCUBOOT_DIR}/ext/mbedtls-asn1")
assert_exists(MBEDTLS_ASN1_DIR)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2 space indent

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

This commit fixes issue where even if Zephyr provided mbedTLS
module was used, ASN1 decoding procedures have been taken from
MCUboot own version of mbedTLS extracted sources for these functions.

To be able to do that this commit changes config file used with
mbedTLS with the one provided from Zephyr (the generic one), which
allows to select required mbedTLS features via Kconfig options
exposed by Zephyr.

Signed-off-by: Dominik Ermel <[email protected]>
@de-nordic de-nordic force-pushed the zephyr-mcuboot-use-generic-config branch from a29d7f8 to 1078a7b Compare January 23, 2025 16:18
@de-nordic de-nordic requested a review from nordicjm January 23, 2025 16:18
@nvlsianpu nvlsianpu merged commit 3f67213 into mcu-tools:main Jan 24, 2025
58 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: zephyr Affects the Zephyr port crypto Encryption support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants