Merge pull request #153 from bjwtaylor/move-everest-headers

Move everest headers
This commit is contained in:
Gilles Peskine
2025-05-28 19:33:01 +02:00
committed by GitHub
3 changed files with 15 additions and 3 deletions
+11 -3
View File
@@ -704,7 +704,9 @@ class TFPSACryptoCodeParser(CodeParser):
"include/mbedtls/*.h",
"drivers/builtin/include/mbedtls/*.h",
"drivers/everest/include/everest/everest.h",
"drivers/everest/include/everest/x25519.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"
])
all_macros["internal"] = self.parse_macros([
"core/*.h",
@@ -725,7 +727,9 @@ class TFPSACryptoCodeParser(CodeParser):
"core/*.c",
"drivers/builtin/src/*.c",
"drivers/everest/include/everest/everest.h",
"drivers/everest/include/everest/x25519.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"
])
identifiers, excluded_identifiers = self.parse_identifiers([
"include/psa/*.h",
@@ -735,7 +739,9 @@ class TFPSACryptoCodeParser(CodeParser):
"core/*.h",
"drivers/builtin/src/*.h",
"drivers/everest/include/everest/everest.h",
"drivers/everest/include/everest/x25519.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"])
mbed_psa_words = self.parse_mbed_psa_words([
"include/psa/*.h",
@@ -746,6 +752,8 @@ class TFPSACryptoCodeParser(CodeParser):
"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",
"core/*.c",
"drivers/builtin/src/*.c",
"drivers/everest/library/everest.c",
+2
View File
@@ -50,10 +50,12 @@ class Expr:
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(
'unsigned long', '%lu',
+2
View File
@@ -173,6 +173,8 @@ def main():
action='append', default=['tf-psa-crypto/include',
'tf-psa-crypto/drivers/builtin/include',
'tf-psa-crypto/drivers/everest/include',
'tf-psa-crypto/drivers/everest/include/' +
'tf-psa-crypto/private',
'include'],
help='Directory for header files')
parser.add_argument('--keep-c',