From 8ac97f5fe8e484f3cc3c15f80cbc028fdee510df Mon Sep 17 00:00:00 2001 From: Ben Taylor Date: Mon, 28 Apr 2025 11:08:33 +0100 Subject: [PATCH] Restore old names as these are still required to support older versions Signed-off-by: Ben Taylor --- scripts/check_names.py | 6 ++++++ scripts/mbedtls_framework/psa_storage.py | 2 ++ 2 files changed, 8 insertions(+) diff --git a/scripts/check_names.py b/scripts/check_names.py index b4309f1f3..0a5d8fbe9 100755 --- a/scripts/check_names.py +++ b/scripts/check_names.py @@ -703,6 +703,8 @@ class TFPSACryptoCodeParser(CodeParser): "include/tf-psa-crypto/*.h", "include/mbedtls/*.h", "drivers/builtin/include/mbedtls/*.h", + "drivers/everest/include/everest/everest.h", + "drivers/everest/include/everest/x25519.h", "drivers/everest/include/tf-psa-crypto/private/everest/everest.h", "drivers/everest/include/tf-psa-crypto/private/everest/x25519.h" ]) @@ -724,6 +726,8 @@ class TFPSACryptoCodeParser(CodeParser): "drivers/builtin/src/*.h", "core/*.c", "drivers/builtin/src/*.c", + "drivers/everest/include/everest/everest.h", + "drivers/everest/include/everest/x25519.h", "drivers/everest/include/tf-psa-crypto/private/everest/everest.h", "drivers/everest/include/tf-psa-crypto/private/everest/x25519.h" ]) @@ -734,6 +738,8 @@ class TFPSACryptoCodeParser(CodeParser): "drivers/builtin/include/mbedtls/*.h", "core/*.h", "drivers/builtin/src/*.h", + "drivers/everest/include/everest/everest.h", + "drivers/everest/include/everest/x25519.h", "drivers/everest/include/tf-psa-crypto/private/everest/everest.h", "drivers/everest/include/tf-psa-crypto/private/everest/x25519.h" ], ["drivers/p256-m/p256-m/p256-m.h"]) diff --git a/scripts/mbedtls_framework/psa_storage.py b/scripts/mbedtls_framework/psa_storage.py index 2e8fabef9..60881ea89 100644 --- a/scripts/mbedtls_framework/psa_storage.py +++ b/scripts/mbedtls_framework/psa_storage.py @@ -49,10 +49,12 @@ class Expr: includes = ['include'] if build_tree.looks_like_tf_psa_crypto_root('.'): includes.append('drivers/builtin/include') + includes.append('drivers/everest/include') includes.append('drivers/everest/include/tf-psa-crypto/private/') elif not build_tree.is_mbedtls_3_6(): includes.append('tf-psa-crypto/include') includes.append('tf-psa-crypto/drivers/builtin/include') + includes.append('tf-psa-crypto/drivers/everest/include') includes.append('tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/') values = c_build_helper.get_c_expression_values(