Fix AESCE regression with Clang due to inclusion order changes #603

Merged

gilles-peskine-arm merged 2 commits from include-common-first-fix-aesce into development

2025-12-18 11:26:14 -06:00

gilles-peskine-arm commented

2025-12-11 09:02:37 -06:00

(Migrated from github.com)

Fix https://github.com/Mbed-TLS/TF-PSA-Crypto/issues/601, a regression introduced by https://github.com/Mbed-TLS/TF-PSA-Crypto/pull/550 which just got merged.

PR checklist

changelog not required because: bug introduced after the last release
framework PR not required
mbedtls development PR not required because: crypto only
mbedtls 3.6 PR https://github.com/Mbed-TLS/mbedtls/pull/10538
tests
- Locally: clang-15 -target aarch64-linux-gnu --sysroot /usr/aarch64-linux-gnu -I include -I core -I drivers/builtin/include -c drivers/builtin/src/aesce.c (see the issue description for more details). I tested locally as far back as clang 7. Clang 6 and earlier have a different problem: https://github.com/Mbed-TLS/TF-PSA-Crypto/issues/604
- On the CI: too much hassle, filed as https://github.com/Mbed-TLS/TF-PSA-Crypto/issues/602
- Check visually that it doesn't regress https://github.com/Mbed-TLS/TF-PSA-Crypto/issues/548

Fix https://github.com/Mbed-TLS/TF-PSA-Crypto/issues/601, a regression introduced by https://github.com/Mbed-TLS/TF-PSA-Crypto/pull/550 which just got merged. ## PR checklist - [x] **changelog** not required because: bug introduced after the last release - [x] **framework PR** not required - [x] **mbedtls development PR** not required because: crypto only - [x] **mbedtls 3.6 PR** https://github.com/Mbed-TLS/mbedtls/pull/10538 - **tests** - Locally: `clang-15 -target aarch64-linux-gnu --sysroot /usr/aarch64-linux-gnu -I include -I core -I drivers/builtin/include -c drivers/builtin/src/aesce.c` (see the [issue description](https://github.com/Mbed-TLS/TF-PSA-Crypto/issues/601) for more details). I tested locally as far back as clang 7. Clang 6 and earlier have a different problem: https://github.com/Mbed-TLS/TF-PSA-Crypto/issues/604 - On the CI: too much hassle, filed as https://github.com/Mbed-TLS/TF-PSA-Crypto/issues/602 - Check visually that it doesn't regress https://github.com/Mbed-TLS/TF-PSA-Crypto/issues/548

gilles-peskine-arm commented

2025-12-11 09:21:00 -06:00

(Migrated from github.com)

I'm adding this issue to the 1.1/4.1 LTS board, not because it particularly has to be done before the LTS, but because if we don't merge this, we'll have a regression compared to 1.0. So it's a “should be done before the next minor release” thing, not a “should be done before the next LTS release.”

davidhorstmann-arm (Migrated from github.com) approved these changes

2025-12-11 10:30:12 -06:00

davidhorstmann-arm (Migrated from github.com) left a comment