Skip to content

Conversation

@felixc-arm
Copy link
Contributor

@felixc-arm felixc-arm commented Jun 11, 2025

framework part of and resolves Mbed-TLS/mbedtls#9944
Depends on Mbed-TLS/mbedtls#10215, Mbed-TLS/TF-PSA-Crypto#313 & Mbed-TLS/mbedtls#10216

Merge order:
Merge the TF-PSA-Crypto PR Mbed-TLS/TF-PSA-Crypto#313
Update the tf-psa-crypto submodule pointer on the mbedtls development PR (Mbed-TLS/mbedtls#10216) to the merge commit of the TF-PSA-Crypto PR
Merge the mbedtls development PR

(Independently) Merge the 3.6 mbedtls PR Mbed-TLS/mbedtls#10215

Then replay or re-trigger the CI, which will pick up the required changes in mbedtls development and mbedtls 3.6 and then should be green.

PR checklist

…ization warning

Signed-off-by: Felix Conway <felix.conway@arm.com>
…MINATED_STRING

This macro applies __attribute__((nonstring)) when the compiler supports it

Signed-off-by: Felix Conway <felix.conway@arm.com>
@felixc-arm felixc-arm marked this pull request as ready for review June 12, 2025 10:54
@felixc-arm felixc-arm added needs-review Every commit must be reviewed by at least two team members, needs-preceding-pr Requires another PR to be merged first needs-reviewer This PR needs someone to pick it up for review priority-high High priority - will be reviewed soon labels Jun 12, 2025
Copy link
Contributor

@gilles-peskine-arm gilles-peskine-arm left a comment

Choose a reason for hiding this comment

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

This change is correct once Mbed-TLS/mbedtls#10215 and Mbed-TLS/TF-PSA-Crypto#313 are merged and mbedtls/development picks up the crypto merge. I think it's complete based on the warnings seen in a 3.6 test run.

psa_key_type_t key_type;
const unsigned char plaintext[16] = "Hello, world...";
unsigned char ciphertext[32] = "(wabblewebblewibblewobblewubble)";
/* We need to tell the compiler that we meant to leave out the null character. */
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't find this comment useful (MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING already says it), but I don't mind having it.

Copy link
Contributor

@mpg mpg left a comment

Choose a reason for hiding this comment

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

LGTM, thanks.

@github-project-automation github-project-automation bot moved this from In Development to Has Approval in Roadmap pull requests (new board) Jun 13, 2025
@mpg mpg added approved Design and code approved - may be waiting for CI or backports needs-ci Needs to pass CI tests and removed needs-review Every commit must be reviewed by at least two team members, needs-reviewer This PR needs someone to pick it up for review labels Jun 16, 2025
@davidhorstmann-arm davidhorstmann-arm removed the needs-preceding-pr Requires another PR to be merged first label Jun 20, 2025
@minosgalanakis minosgalanakis merged commit 2a3e2c5 into Mbed-TLS:main Jun 21, 2025
3 checks passed
@github-project-automation github-project-automation bot moved this from Has Approval to Done in Roadmap pull requests (new board) Jun 21, 2025
@minosgalanakis minosgalanakis removed the needs-ci Needs to pass CI tests label Jun 21, 2025
@felixc-arm felixc-arm deleted the gcc-15-warning branch June 26, 2025 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Design and code approved - may be waiting for CI or backports priority-high High priority - will be reviewed soon

Development

Successfully merging this pull request may close these issues.

Warnings from GCC 15 -Wunterminated-string-initialization

5 participants