From 409c688c4b595db2e178e805260fbfbbb9de5fd7 Mon Sep 17 00:00:00 2001
From: Gilles Peskine <Gilles.Peskine@arm.com>
Date: Sat, 26 Jul 2025 00:15:21 +0200
Subject: [PATCH] Include mbedtls/platform_time.h conditionally on
 MBEDTLS_HAVE_TIME

Work around https://github.com/Mbed-TLS/TF-PSA-Crypto/issues/393

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
---
 scripts/data_files/query_config.fmt | 5 +++++
 scripts/generate_query_config.pl    | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/data_files/query_config.fmt b/scripts/data_files/query_config.fmt
index 559734a6af..c60458b61b 100644
--- a/scripts/data_files/query_config.fmt
+++ b/scripts/data_files/query_config.fmt
@@ -12,6 +12,11 @@
 #include "mbedtls/platform.h"
 #include <string.h>
 
+/* Work around https://github.com/Mbed-TLS/TF-PSA-Crypto/issues/393 */
+#if defined(MBEDTLS_HAVE_TIME)
+#include <mbedtls/platform_time.h>
+#endif
+
 INCLUDE_HEADERS
 
 /*
diff --git a/scripts/generate_query_config.pl b/scripts/generate_query_config.pl
index e99d633de6..49e363de54 100755
--- a/scripts/generate_query_config.pl
+++ b/scripts/generate_query_config.pl
@@ -121,7 +121,11 @@ for my $root (@header_roots) {
     map {s!^\Q$root/!!} @paths;
     # Exclude some headers that are included by build_info.h and cannot
     # be included directly.
-    push @header_files, grep {!m!_config\.h|[/_]adjust[/_]!} @paths;
+    push @header_files, grep {!m[
+            ^mbedtls/platform_time\.h$ | # errors without time.h
+            _config\.h |
+            [/_]adjust[/_]
+        ]x} @paths;
 }
 my $include_headers = join('', map {"#include <$_>\n"} @header_files);