From 75e8e030b1507fdf9b09169ddc8f4efbe2f988a7 Mon Sep 17 00:00:00 2001 From: Harry Ramsey Date: Tue, 22 Oct 2024 10:06:59 +0100 Subject: [PATCH] Fix paths for programs/psa This commit fixes paths for programs/psa to tf-psa-crypto/programs/psa. Signed-off-by: Harry Ramsey --- scripts/generate_psa_constants.py | 6 +++--- tests/psa-client-server/psasim/src/aut_psa_aead_encrypt.c | 2 +- tests/scripts/check-generated-files.sh | 2 +- tests/scripts/psa_collect_statuses.py | 2 +- tests/scripts/test_psa_constant_names.py | 2 +- tf-psa-crypto/programs/psa/aead_demo.c | 2 +- tf-psa-crypto/programs/psa/hmac_demo.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/generate_psa_constants.py b/scripts/generate_psa_constants.py index d472c6dc51..a63636307a 100755 --- a/scripts/generate_psa_constants.py +++ b/scripts/generate_psa_constants.py @@ -1,13 +1,13 @@ #!/usr/bin/env python3 """Generate psa_constant_names_generated.c -which is included by programs/psa/psa_constant_names.c. +which is included by tf-psa-crypto/programs/psa/psa_constant_names.c. The code generated by this module is only meant to be used in the context of that program. An argument passed to this script will modify the output directory where the file is written: -* by default (no arguments passed): writes to programs/psa/ +* by default (no arguments passed): writes to tf-psa-crypto/programs/psa/ * OUTPUT_FILE_DIR passed: writes to OUTPUT_FILE_DIR/ """ @@ -327,7 +327,7 @@ def generate_psa_constants(header_file_names, output_file_name): if __name__ == '__main__': build_tree.chdir_to_root() # 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 "programs/psa" + OUTPUT_FILE_DIR = sys.argv[1] if len(sys.argv) == 2 else "tf-psa-crypto/programs/psa" generate_psa_constants(['tf-psa-crypto/include/psa/crypto_values.h', 'tf-psa-crypto/include/psa/crypto_extra.h'], diff --git a/tests/psa-client-server/psasim/src/aut_psa_aead_encrypt.c b/tests/psa-client-server/psasim/src/aut_psa_aead_encrypt.c index 64463f57fc..ccdb62d20f 100644 --- a/tests/psa-client-server/psasim/src/aut_psa_aead_encrypt.c +++ b/tests/psa-client-server/psasim/src/aut_psa_aead_encrypt.c @@ -47,7 +47,7 @@ void print_buf(const char *title, uint8_t *buf, size_t len) /* Run a PSA function and bail out if it fails. * The symbolic name of the error code can be recovered using: - * programs/psa/psa_constant_name status */ + * tf-psa-crypto/programs/psa/psa_constant_name status */ #define PSA_CHECK(expr) \ do \ { \ diff --git a/tests/scripts/check-generated-files.sh b/tests/scripts/check-generated-files.sh index 35990d0db2..934276dc35 100755 --- a/tests/scripts/check-generated-files.sh +++ b/tests/scripts/check-generated-files.sh @@ -163,7 +163,7 @@ else check framework/scripts/generate_psa_tests.py $(framework/scripts/generate_psa_tests.py --list) fi -check scripts/generate_psa_constants.py programs/psa/psa_constant_names_generated.c +check scripts/generate_psa_constants.py tf-psa-crypto/programs/psa/psa_constant_names_generated.c check framework/scripts/generate_test_keys.py framework/tests/src/test_keys.h check scripts/generate_driver_wrappers.py ${crypto_core_dir}/psa_crypto_driver_wrappers.h \ ${crypto_core_dir}/psa_crypto_driver_wrappers_no_static.c diff --git a/tests/scripts/psa_collect_statuses.py b/tests/scripts/psa_collect_statuses.py index 11bbebcc1f..d835ba7c9a 100755 --- a/tests/scripts/psa_collect_statuses.py +++ b/tests/scripts/psa_collect_statuses.py @@ -21,7 +21,7 @@ import subprocess import sys DEFAULT_STATUS_LOG_FILE = 'tests/statuses.log' -DEFAULT_PSA_CONSTANT_NAMES = 'programs/psa/psa_constant_names' +DEFAULT_PSA_CONSTANT_NAMES = 'tf-psa-crypto/programs/psa/psa_constant_names' class Statuses: """Information about observed return statues of API functions.""" diff --git a/tests/scripts/test_psa_constant_names.py b/tests/scripts/test_psa_constant_names.py index 8ed0fee4b6..e697d1755c 100755 --- a/tests/scripts/test_psa_constant_names.py +++ b/tests/scripts/test_psa_constant_names.py @@ -173,7 +173,7 @@ def main(): action='store_false', dest='keep_c', help='Don\'t keep the intermediate C file (default)') parser.add_argument('--program', - default='programs/psa/psa_constant_names', + default='tf-psa-crypto/programs/psa/psa_constant_names', help='Program to test') parser.add_argument('--show', action='store_true', diff --git a/tf-psa-crypto/programs/psa/aead_demo.c b/tf-psa-crypto/programs/psa/aead_demo.c index 2d99e3cbec..e38b72a7f4 100644 --- a/tf-psa-crypto/programs/psa/aead_demo.c +++ b/tf-psa-crypto/programs/psa/aead_demo.c @@ -93,7 +93,7 @@ static void print_buf(const char *title, uint8_t *buf, size_t len) /* Run a PSA function and bail out if it fails. * The symbolic name of the error code can be recovered using: - * programs/psa/psa_constant_name status */ + * tf-psa-crypto/programs/psa/psa_constant_name status */ #define PSA_CHECK(expr) \ do \ { \ diff --git a/tf-psa-crypto/programs/psa/hmac_demo.c b/tf-psa-crypto/programs/psa/hmac_demo.c index 683f3e59c9..63547de942 100644 --- a/tf-psa-crypto/programs/psa/hmac_demo.c +++ b/tf-psa-crypto/programs/psa/hmac_demo.c @@ -70,7 +70,7 @@ static void print_buf(const char *title, uint8_t *buf, size_t len) /* Run a PSA function and bail out if it fails. * The symbolic name of the error code can be recovered using: - * programs/psa/psa_constant_name status */ + * tf-psa-crypto/programs/psa/psa_constant_name status */ #define PSA_CHECK(expr) \ do \ { \