Move programs/psa to tf-psa-crypto #9717
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tf-psa-crypto/programs/Makefile
Outdated
| @@ -0,0 +1,83 @@ | |||
| MBEDTLS_TEST_PATH = ../tests | |||
There was a problem hiding this comment.
There is no make build system in tf-psa-crypto and we do not plan to add one thus we need to just adapt the make files in mbedtls to the new location of the PSA programs. That's how we have done it for test suites, the crypto library ...
Harry-Ramsey
force-pushed
the
move-programs-psa-tf-psa-crypto-development
branch
7 times, most recently
from
6893477
to
0d8c743
Compare
|
Hopefully now if CI passes this is the correct implementation for enabling programs to be moved to |
Harry-Ramsey
commented
Oct 31, 2024
Harry-Ramsey
added
enhancement
component-psa
ronald-cron-arm
requested changes
Nov 4, 2024
There was a problem hiding this comment.
This looks quite good to me but there are things I would like to improve, see my comments. Otherwise I haven't checked but it is likely that with the changes in this PR the PSA programs key_ladder_demo and psa_hash are no longer executed as part of run_demos.py. Please check that, thanks.
| @@ -8,7 +8,7 @@ if (NOT WIN32) | |||
| endif() | |||
| add_subdirectory(hash) | |||
| add_subdirectory(pkey) | |||
| add_subdirectory(psa) | |||
| add_subdirectory(../tf-psa-crypto/programs/psa ../tf-psa-crypto/programs/psa) | |||
There was a problem hiding this comment.
Just a comment. Eventually we want to move that to tf-psa-cypto/programs/CMakeLists.txt but it will be easier when #9615 is completed.
Harry-Ramsey
force-pushed
the
move-programs-psa-tf-psa-crypto-development
branch
2 times, most recently
from
35876cd
to
0df7120
Compare
|
This should pass CI now and be ready for a proper review since I had to fix a few empty commit issues. |
ronald-cron-arm
added
needs-review
ronald-cron-arm
requested changes
Nov 5, 2024
There was a problem hiding this comment.
The last changes look good to me, thanks.
However the run_demos.py issue does not seem to be addressed.
If I do:
make neat
make
./tests/scripts/run_demos.py
the programs key_ladder_demo and psa_hash are not run. They are on development.
Please adapt run_demos.py as necessary.
Other point, please update programs/.gitignore and tf-psa-crypto/programs/.gitignore according to the file moves.
gabor-mezei-arm
requested changes
Nov 8, 2024
ronald-cron-arm
requested review from
ronald-cron-arm
and removed request for
minosgalanakis
gabor-mezei-arm
requested changes
Nov 18, 2024
Harry-Ramsey
force-pushed
the
move-programs-psa-tf-psa-crypto-development
branch
2 times, most recently
from
72f1ba7
to
d461efb
Compare
ronald-cron-arm
requested changes
Nov 20, 2024
|
@Harry-Ramsey sorry about that but it needs to be rebased: two conflicts. |
This commit moves psa programs from the programs/psa directory to tf-psa-crypto/programs/psa directory. Signed-off-by: Harry Ramsey <[email protected]>
This commit fixes paths for programs/psa to tf-psa-crypto/programs/psa. Signed-off-by: Harry Ramsey <[email protected]>
This commit adjusts the paths of programs/psa to tf-psa-crypto/programs. Signed-off-by: Harry Ramsey <[email protected]>
This commit adjusts the paths of programs/psa to tf-psa-crypto/programs in CMakeLists.txt. Signed-off-by: Harry Ramsey <[email protected]>
This commit updates the paths in generate_visualc_files.pl to update the generated .sln file with the new paths for psa programs. Signed-off-by: Harry Ramsey <[email protected]>
This commit refactors the Makefile in the programs directory to remove unused variables and consistent naming schemes. Signed-off-by: Harry Ramsey <[email protected]>
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 <[email protected]>
This commit refactors comments refering to tf-psa-crypto for the correct path upon repo split. Signed-off-by: Harry Ramsey <[email protected]>
This commit uses static paths in the makefile to create programs since the script generate_visualc_files.pl cannot substitute variable paths. Signed-off-by: Harry Ramsey <[email protected]>
This commit fixes incorrect paths to generate_psa_constants.py after being moves to tf-psa-crypto. Signed-off-by: Harry Ramsey <[email protected]>
This commit updates the path to the generate_psa_constants.py script in programs/psa/CMakeList.txt file. Signed-off-by: Harry Ramsey <[email protected]>
This commit updates the path to generate_psa_constants.py in check-generated-files.sh Signed-off-by: Harry Ramsey <[email protected]>
This commit fixes make_generated_files.bat as it requires the user to be inside the tf-psa-directory to invoke generate_psa_constants.py. Signed-off-by: Harry Ramsey <[email protected]>
Update gitignore in programs and tf-psa-crypto following the move of multiple files. Signed-off-by: Harry Ramsey <[email protected]>
This commit updates the path to programs in run_demos.py to tf-psa-crypto/programs. Signed-off-by: Harry Ramsey <[email protected]>
This commit updates a recipe path in programs/Makefile. Signed-off-by: Harry Ramsey <[email protected]>
This commit reverts tf-psa-crypto program CC output informing the user what file is being compiled. Signed-off-by: Harry Ramsey <[email protected]>
This commit moves programs from tf-psa-crypto/.gitignore to tf-psa-crypto/programs/.gitignore. Signed-off-by: Harry Ramsey <[email protected]>
This commit removes the duplicate demo_common.sh file in tf-psa-crypto and instead use the demo_common.sh file in mbedtls/programs. Signed-off-by: Harry Ramsey <[email protected]>
This commit concatenates the running of program demos between Mbed TLS and TF-PSA-Crypto. Signed-off-by: Harry Ramsey <[email protected]>
Harry-Ramsey
force-pushed
the
move-programs-psa-tf-psa-crypto-development
branch
from
ce7b71c
to
7fa6cae
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This pull request moves program/psa to tf-psa-crypto/programs/psa.
This pull request cloes #9267.
PR checklist
Please remove the segment/s on either side of the | symbol as appropriate, and add any relevant link/s to the end of the line.
If the provided content is part of the present PR remove the # symbol.
Notes for the submitter
Please refer to the contributing guidelines, especially the
checklist for PR contributors.
Help make review efficient: