mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-18 05:42:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move generate_psa_constants.py to tf-psa-crypto

Browse Source 
This commit moves generate_psa_constants.py to tf-psa-crypto and updates
the paths inside the script necessary for that move.

Signed-off-by: Harry Ramsey <harry.ramsey@arm.com>
This commit is contained in:
Harry Ramsey 2024-11-04 14:51:35 +00:00
parent fae7411429
commit e1d6f74b92
4 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
programs/Makefile
View File

@ -133,13 +133,13 @@ ${MBEDTLS_TEST_OBJS}:
GENERATED_FILES = psa/psa_constant_names_generated.c test/query_config.c GENERATED_FILES = psa/psa_constant_names_generated.c test/query_config.c
generated_files: $(GENERATED_FILES) generated_files: $(GENERATED_FILES)
psa/psa_constant_names_generated.c: $(gen_file_dep) ../scripts/generate_psa_constants.py psa/psa_constant_names_generated.c: $(gen_file_dep) ../tf-psa-crypto/scripts/generate_psa_constants.py
psa/psa_constant_names_generated.c: $(gen_file_dep) ../tf-psa-crypto/include/psa/crypto_values.h psa/psa_constant_names_generated.c: $(gen_file_dep) ../tf-psa-crypto/include/psa/crypto_values.h
psa/psa_constant_names_generated.c: $(gen_file_dep) ../tf-psa-crypto/include/psa/crypto_extra.h psa/psa_constant_names_generated.c: $(gen_file_dep) ../tf-psa-crypto/include/psa/crypto_extra.h
psa/psa_constant_names_generated.c: $(gen_file_dep) ../tf-psa-crypto/tests/suites/test_suite_psa_crypto_metadata.data psa/psa_constant_names_generated.c: $(gen_file_dep) ../tf-psa-crypto/tests/suites/test_suite_psa_crypto_metadata.data
psa/psa_constant_names_generated.c: psa/psa_constant_names_generated.c:
echo " Gen $@" echo " Gen $@"
$(PYTHON) ../scripts/generate_psa_constants.py cd ../tf-psa-crypto; $(PYTHON) ../scripts/generate_psa_constants.py
test/query_config.c: $(gen_file_dep) ../scripts/generate_query_config.pl test/query_config.c: $(gen_file_dep) ../scripts/generate_query_config.pl
## The generated file only depends on the options that are present in mbedtls_config.h, ## The generated file only depends on the options that are present in mbedtls_config.h,

6
tf-psa-crypto/programs/psa/CMakeLists.txt
View File

@ -19,9 +19,9 @@ if(GEN_FILES)
WORKING_DIRECTORY WORKING_DIRECTORY
${CMAKE_CURRENT_SOURCE_DIR}/../../.. ${CMAKE_CURRENT_SOURCE_DIR}/../../..
DEPENDS DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/../../../scripts/generate_psa_constants.py ${CMAKE_CURRENT_SOURCE_DIR}/../../scripts/generate_psa_constants.py
${CMAKE_CURRENT_SOURCE_DIR}/../../../tf-psa-crypto/include/psa/crypto_values.h ${CMAKE_CURRENT_SOURCE_DIR}/../../include/psa/crypto_values.h
${CMAKE_CURRENT_SOURCE_DIR}/../../../tf-psa-crypto/include/psa/crypto_extra.h ${CMAKE_CURRENT_SOURCE_DIR}/../../include/psa/crypto_extra.h
) )
else() else()
link_to_source(psa_constant_names_generated.c) link_to_source(psa_constant_names_generated.c)

17
tf-psa-crypto/scripts/framework_scripts_path.py Normal file
View File

@ -0,0 +1,17 @@
"""Add our Python library directory to the module search path.
Usage:
import framework_scripts_path # pylint: disable=unused-import
"""
# Copyright The Mbed TLS Contributors
# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
#
import os
import sys
sys.path.append(os.path.join(os.path.dirname(__file__),
os.path.pardir,
'framework', 'scripts'))

10
scripts/generate_psa_constants.py → tf-psa-crypto/scripts/generate_psa_constants.py
View File

@ -1,13 +1,13 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
"""Generate psa_constant_names_generated.c """Generate psa_constant_names_generated.c
which is included by tf-psa-crypto/programs/psa/psa_constant_names.c. which is included by programs/psa/psa_constant_names.c.
The code generated by this module is only meant to be used in the context The code generated by this module is only meant to be used in the context
of that program. of that program.
An argument passed to this script will modify the output directory where the An argument passed to this script will modify the output directory where the
file is written: file is written:
* by default (no arguments passed): writes to tf-psa-crypto/programs/psa/ * by default (no arguments passed): writes to programs/psa/
* OUTPUT_FILE_DIR passed: writes to OUTPUT_FILE_DIR/ * OUTPUT_FILE_DIR passed: writes to OUTPUT_FILE_DIR/
""" """
@ -327,8 +327,8 @@ def generate_psa_constants(header_file_names, output_file_name):
if __name__ == '__main__': if __name__ == '__main__':
build_tree.chdir_to_root() build_tree.chdir_to_root()
# Allow to change the directory where psa_constant_names_generated.c is written to. # Allow to change the directory where psa_constant_names_generated.c is written to.
OUTPUT_FILE_DIR = sys.argv[1] if len(sys.argv) == 2 else "tf-psa-crypto/programs/psa" OUTPUT_FILE_DIR = sys.argv[1] if len(sys.argv) == 2 else "programs/psa"
generate_psa_constants(['tf-psa-crypto/include/psa/crypto_values.h', generate_psa_constants(['include/psa/crypto_values.h',
'tf-psa-crypto/include/psa/crypto_extra.h'], 'include/psa/crypto_extra.h'],
OUTPUT_FILE_DIR + '/psa_constant_names_generated.c') OUTPUT_FILE_DIR + '/psa_constant_names_generated.c')