8000 Merge pull request #153 from bjwtaylor/move-everest-headers · Mbed-TLS/mbedtls-framework@fdb0615 · GitHub
[go: up one dir, main page]
Skip to content

Commit fdb0615

Browse files
gilles-peskine-armgilles-peskine-arm
authored
Merge pull request #153 from bjwtaylor/move-everest-headers
Move everest headers
2 parents 115d9af + ebc32ad commit fdb0615

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

‎scripts/check_names.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,9 @@ def comprehensive_parse(self):
704704
"include/mbedtls/*.h",
705705
"drivers/builtin/include/mbedtls/*.h",
706706
"drivers/everest/include/everest/everest.h",
707-
"drivers/everest/include/everest/x25519.h"
707+
"drivers/everest/include/everest/x25519.h",
708+
"drivers/everest/include/tf-psa-crypto/private/everest/everest.h",
709+
"drivers/everest/include/tf-psa-crypto/private/everest/x25519.h"
708710
])
709711
all_macros["internal"] = self.parse_macros([
710712
"core/*.h",
@@ -725,7 +727,9 @@ def comprehensive_parse(self):
725727
"core/*.c",
726728
"drivers/builtin/src/*.c",
727729
"drivers/everest/include/everest/everest.h",
728-
"drivers/everest/include/everest/x25519.h"
730+
"drivers/everest/include/everest/x25519.h",
731+
"drivers/everest/include/tf-psa-crypto/private/everest/everest.h",
732+
"drivers/everest/include/tf-psa-crypto/private/everest/x25519.h"
729733
])
730734
identifiers, excluded_identifiers = self.parse_identifiers([
731735
"include/psa/*.h",
@@ -735,7 +739,9 @@ def comprehensive_parse(self):
735739
"core/*.h",
736740
"drivers/builtin/src/*.h",
737741
"drivers/everest/include/everest/everest.h",
738-
"drivers/everest/include/everest/x25519.h"
742+
"drivers/everest/include/everest/x25519.h",
743+
"drivers/everest/include/tf-psa-crypto/private/everest/everest.h",
744+
"drivers/everest/include/tf-psa-crypto/private/everest/x25519.h"
739745
], ["drivers/p256-m/p256-m/p256-m.h"])
740746
mbed_psa_words = self.parse_mbed_psa_words([
741747
"include/psa/*.h",
@@ -746,6 +752,8 @@ def comprehensive_parse(self):
746752
"drivers/builtin/src/*.h",
747753
"drivers/everest/include/everest/everest.h",
748754
"drivers/everest/include/everest/x25519.h",
755+
"drivers/everest/include/tf-psa-crypto/private/everest/everest.h",
756+
"drivers/everest/include/tf-psa-crypto/private/everest/x25519.h",
749757
"core/*.c",
750758
"drivers/builtin/src/*.c",
751759
"drivers/everest/library/everest.c",

‎scripts/mbedtls_framework/psa_storage.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,12 @@ def update_cache(self) -> None:
5050
if build_tree.looks_like_tf_psa_crypto_root('.'):
5151
includes.append('drivers/builtin/include')
5252
includes.append('drivers/everest/include')
53+
includes.append('drivers/everest/include/tf-psa-crypto/private/')
5354
elif not build_tree.is_mbedtls_3_6():
5455
includes.append('tf-psa-crypto/include')
5556
includes.append('tf-psa-crypto/drivers/builtin/include')
5657
includes.append('tf-psa-crypto/drivers/everest/include')
58+
includes.append('tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/')
5759

5860
values = c_build_helper.get_c_expression_values(
5961
'unsigned long', '%lu',

‎scripts/test_psa_constant_names.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ def main():
173173
action='append', default=['tf-psa-crypto/include',
174174
'tf-psa-crypto/drivers/builtin/include',
175175
'tf-psa-crypto/drivers/everest/include',
176+
'tf-psa-crypto/drivers/everest/include/' +
177+
'tf-psa-crypto/private',
176178
'include'],
177179
help='Directory for header files')
178180
parser.add_argument('--keep-c',

0 commit comments

Comments
 (0)
0