Skip to content

Conversation

@valeriosetti
Copy link
Collaborator

"get_padding()" function of "struct mbedtls_cipher_context_t" starting from Mbed TLS v3.6.5 has 4 input parameters instead of 3 as it was until v3.6.4.
This commit copies only changes to "cipher.h" from Mbed TLS commit: 6cb9f35d8c84d6b3d92e2071a31fb6b183da949f

This commit will be removed in the next TF-M release that includes Mbed TLS v3.6.5.

Copy link
Collaborator

@tomi-font tomi-font left a comment

Choose a reason for hiding this comment

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

While we're at it, could you align all the Mbed TLS files to 3.6.5 if it's relatively straightforward? There might be other issues that just haven't been discovered yet, and better be safe as the Zephyr release is about to go out.

@valeriosetti valeriosetti changed the title [zep noup] interface: mbedtls: fix cipher padding functions signatures [zep noup] interface: mbedtls: align Mbed TLS header files to v3.6.5 Nov 11, 2025
Copy link
Collaborator

@tomi-font tomi-font left a comment

Choose a reason for hiding this comment

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

No diff, looks good.
However I think there are also the PSA header files, and in this case there are some differences:

modified: interface/include/psa/crypto.h
modified: interface/include/psa/crypto_extra.h

I'm not sure whether these files are meant to be identical.

@valeriosetti
Copy link
Collaborator Author

I'm not sure whether these files are meant to be identical.

I checked and most of the changes in those files look like just re-ordering. I included these changes and the Zephyr PR is testing them so let's see what the CI thinks about it.

TF-M holds a copy of Mbed TLS header files and prior to this commit they were aligned to Mbed TLS v3.6.3. This commit updates them to what's in release v3.6.5. This commit will be removed in the next TF-M release that includes Mbed TLS v3.6.5. Signed-off-by: Valerio Setti <vsetti@baylibre.com>
@tomi-font tomi-font merged commit 04aa724 into zephyrproject-rtos:main Nov 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

3 participants