Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions doc/releases/release-notes-4.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,9 @@ Libraries / Subsystems

* Crypto

* 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
Comment on lines +302 to +303
Copy link
Contributor

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
Contributor 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
Contributor

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
Contributor 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
Contributor 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.


* CMSIS-NN

* FPGA
Expand Down
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ manifest:
revision: 2b498e6f36d6b82ae1da12c8b7742e318624ecf5
path: modules/lib/gui/lvgl
- name: mbedtls
revision: 2f24831ee13d399ce019c4632b0bcd440a713f7c
revision: fb36f3fe20f9f62e67b1a20c0cfe0a6788ec2bf6
path: modules/crypto/mbedtls
groups:
- crypto
Expand Down
Loading