From 4995d4435c26fe8bcaa11a7db73669ac153d41a2 Mon Sep 17 00:00:00 2001
From: Gilles Peskine <Gilles.Peskine@arm.com>
Date: Sat, 26 Jul 2025 00:19:32 +0200
Subject: [PATCH] Don't incude auxiliary headers that have alternative versions

When compiling with `MBEDTLS_PSA_CRYPTO_PLATFORM_FILE`, we must not include
`<psa/crypto_platform.h`. Same with `MBEDTLS_PSA_CRYPTO_STRUCT_FILE` and
`<psa/crypto_struct.h>`.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
---
 scripts/generate_query_config.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/generate_query_config.pl b/scripts/generate_query_config.pl
index 49e363de54..99128ca7ac 100755
--- a/scripts/generate_query_config.pl
+++ b/scripts/generate_query_config.pl
@@ -122,6 +122,7 @@ for my $root (@header_roots) {
     # Exclude some headers that are included by build_info.h and cannot
     # be included directly.
     push @header_files, grep {!m[
+            ^psa/crypto_(platform|struct)\.h$ | # have alt versions, included by psa/crypto.h anyway
             ^mbedtls/platform_time\.h$ | # errors without time.h
             _config\.h |
             [/_]adjust[/_]