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

manifest: mbedtls: update to 3.6.1 #77874

Merged
merged 1 commit into from
Sep 5, 2024

Conversation

tomi-font
Copy link
Collaborator

Brings in Mbed TLS 3.6.1.

@zephyrbot zephyrbot added the size: XS A PR changing only a single line of code label Sep 2, 2024
@zephyrbot
Copy link
Collaborator

zephyrbot commented Sep 2, 2024

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
mbedtls zephyrproject-rtos/mbedtls@2f24831 zephyrproject-rtos/mbedtls@fb36f3f (zephyr) zephyrproject-rtos/mbedtls@2f24831e..fb36f3fe

Note: This message is automatically posted and updated by the Manifest GitHub Action.

nordicjm
nordicjm previously approved these changes Sep 3, 2024
Vge0rge
Vge0rge previously approved these changes Sep 3, 2024
Brings in Mbed TLS 3.6.1.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
@tomi-font tomi-font dismissed stale reviews from Vge0rge and nordicjm via 9f5c6d2 September 4, 2024 08:02
@zephyrbot zephyrbot added the Release Notes To be mentioned in the release notes label Sep 4, 2024
@zephyrbot zephyrbot removed the DNM This PR should not be merged (Do Not Merge) label Sep 4, 2024
Comment on lines +302 to +303
* Mbed TLS was updated to version 3.6.1. The release notes can be found at:
https://github.com/Mbed-TLS/mbedtls/releases/tag/mbedtls-3.6.1
Copy link
Collaborator

Choose a reason for hiding this comment

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

this will fail on 3.7 backport

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

What will happen? Should something be done about it now?

Copy link
Collaborator

Choose a reason for hiding this comment

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

It won't apply because this file doesn't exist, a branch will be created which you will need to manually fix so it can be applied

Copy link
Contributor

Choose a reason for hiding this comment

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

Is the goal to backport this to 3.7? Asking as I don't see that mentioned in the PR. Either way, it would be good to have Zephyr LTS continue to track the mbedTLS LTS version.

Copy link
Member

Choose a reason for hiding this comment

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

yep, LTS should keep MBEDTLS updated.

Copy link
Member

Choose a reason for hiding this comment

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

btw, I wouldn't add anything in the release notes right now since we may end up updating it before our release in cases there is another MBEDTLS release.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Is the goal to backport this to 3.7? Asking as I don't see that mentioned in the PR. Either way, it would be good to have Zephyr LTS continue to track the mbedTLS LTS version.

Absolutely. I have added the backport v3.7-branch label. From that you can see that a backport is planned.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

btw, I wouldn't add anything in the release notes right now since we may end up updating it before our release in cases there is another MBEDTLS release.

Yeah true in a sense, that would also have prevented conflicts with backporting as @nordicjm pointed out. But now it's done and there are approvals so let's go with this. The release notes can simply be updated if/when Mbed TLS is updated again. At least the release note is already there.

@carlescufi carlescufi merged commit b9b166c into zephyrproject-rtos:main Sep 5, 2024
26 of 28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport v3.7-branch Request backport to the v3.7-branch manifest manifest-mbedtls Release Notes To be mentioned in the release notes size: XS A PR changing only a single line of code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants