From 2d6374a0f918d7f2026ad05c20d7e6ec7e04e0a0 Mon Sep 17 00:00:00 2001 From: Ben Taylor Date: Tue, 25 Mar 2025 08:29:17 +0000 Subject: [PATCH 01/13] adjust everest header paths in generate_visualc_files.pl Signed-off-by: Ben Taylor --- scripts/generate_visualc_files.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/generate_visualc_files.pl b/scripts/generate_visualc_files.pl index 81521896b4..7ef46968b5 100755 --- a/scripts/generate_visualc_files.pl +++ b/scripts/generate_visualc_files.pl @@ -50,7 +50,7 @@ my $test_drivers_header_dir = 'framework/tests/include/test/drivers'; my $test_drivers_source_dir = 'framework/tests/src/drivers'; my @thirdparty_header_dirs = qw( - tf-psa-crypto/drivers/everest/include/everest + tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest ); my @thirdparty_source_dirs = qw( tf-psa-crypto/drivers/everest/library @@ -65,10 +65,10 @@ my @include_directories = qw( include tf-psa-crypto/include tf-psa-crypto/drivers/builtin/include - tf-psa-crypto/drivers/everest/include/ - tf-psa-crypto/drivers/everest/include/everest - tf-psa-crypto/drivers/everest/include/everest/vs2013 - tf-psa-crypto/drivers/everest/include/everest/kremlib + tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/ + tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest + tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest/vs2013 + tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest/kremlib tests/include tf-psa-crypto/tests/include framework/tests/include From 243b54f3869953a674ff6730685a623a98a1d9cd Mon Sep 17 00:00:00 2001 From: Ben Taylor Date: Thu, 27 Mar 2025 13:41:29 +0000 Subject: [PATCH 02/13] update further everest paths Signed-off-by: Ben Taylor --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a099356389..bda3977d07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -441,7 +441,7 @@ if(ENABLE_TESTING OR ENABLE_PROGRAMS) PRIVATE include PRIVATE tf-psa-crypto/include PRIVATE tf-psa-crypto/drivers/builtin/include - PRIVATE tf-psa-crypto/drivers/everest/include + PRIVATE tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/ PRIVATE library PRIVATE tf-psa-crypto/core PRIVATE tf-psa-crypto/drivers/builtin/src) @@ -480,7 +480,7 @@ if(ENABLE_TESTING OR ENABLE_PROGRAMS) PRIVATE library PRIVATE tf-psa-crypto/core PRIVATE tf-psa-crypto/drivers/builtin/src - PRIVATE tf-psa-crypto/drivers/everest/include) + PRIVATE tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/) set_config_files_compile_definitions(mbedtls_test_helpers) endif() From 142347383fb312f45ef87cee95c8de0aeaf0df6c Mon Sep 17 00:00:00 2001 From: Ben Taylor Date: Thu, 3 Apr 2025 10:42:19 +0100 Subject: [PATCH 03/13] Add ChangeLog for removal of everest headers Signed-off-by: Ben Taylor --- ChangeLog.d/remove-everest-headers.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 ChangeLog.d/remove-everest-headers.txt diff --git a/ChangeLog.d/remove-everest-headers.txt b/ChangeLog.d/remove-everest-headers.txt new file mode 100644 index 0000000000..7dfdddcd52 --- /dev/null +++ b/ChangeLog.d/remove-everest-headers.txt @@ -0,0 +1,3 @@ +Removals + * Removed everest headers from mbedtls as they will be moved to + tf-psa-crypto. From 40bc3489630ab02fd7ae5c6b4518d92062e0481e Mon Sep 17 00:00:00 2001 From: Ben Taylor Date: Thu, 3 Apr 2025 14:49:29 +0100 Subject: [PATCH 04/13] corrected ChangeLog Signed-off-by: Ben Taylor --- ChangeLog.d/move-everest-headers.txt | 2 ++ ChangeLog.d/remove-everest-headers.txt | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 ChangeLog.d/move-everest-headers.txt delete mode 100644 ChangeLog.d/remove-everest-headers.txt diff --git a/ChangeLog.d/move-everest-headers.txt b/ChangeLog.d/move-everest-headers.txt new file mode 100644 index 0000000000..f80a6d16e4 --- /dev/null +++ b/ChangeLog.d/move-everest-headers.txt @@ -0,0 +1,2 @@ +Changes + * Update path's for new everest header path. diff --git a/ChangeLog.d/remove-everest-headers.txt b/ChangeLog.d/remove-everest-headers.txt deleted file mode 100644 index 7dfdddcd52..0000000000 --- a/ChangeLog.d/remove-everest-headers.txt +++ /dev/null @@ -1,3 +0,0 @@ -Removals - * Removed everest headers from mbedtls as they will be moved to - tf-psa-crypto. From de864e7a1c63645f7f66c0fe69aca84b84d1c73d Mon Sep 17 00:00:00 2001 From: Ben Taylor Date: Tue, 22 Apr 2025 10:46:17 +0100 Subject: [PATCH 05/13] Remove ChangeLog as it is not required Signed-off-by: Ben Taylor --- ChangeLog.d/move-everest-headers.txt | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 ChangeLog.d/move-everest-headers.txt diff --git a/ChangeLog.d/move-everest-headers.txt b/ChangeLog.d/move-everest-headers.txt deleted file mode 100644 index f80a6d16e4..0000000000 --- a/ChangeLog.d/move-everest-headers.txt +++ /dev/null @@ -1,2 +0,0 @@ -Changes - * Update path's for new everest header path. From 83e5a7bf75ba8a24392ecdc93fe68f48fd56557a Mon Sep 17 00:00:00 2001 From: Ben Taylor Date: Thu, 29 May 2025 08:11:48 +0100 Subject: [PATCH 06/13] update framework submodule to pull in everest changes Signed-off-by: Ben Taylor --- .gitmodules | 2 +- framework | 2 +- tf-psa-crypto | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4612b3d0c9..7e34e96984 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,4 +3,4 @@ url = https://github.com/Mbed-TLS/mbedtls-framework [submodule "tf-psa-crypto"] path = tf-psa-crypto - url = https://github.com/Mbed-TLS/TF-PSA-Crypto.git + url = git@github.com:bjwtaylor/TF-PSA-Crypto.git diff --git a/framework b/framework index 1a83e0c84d..fdb0615d9a 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 1a83e0c84d4b7aa11c7cfd3771322486fc87d281 +Subproject commit fdb0615d9a72c95cdf7f67e77bfcf0418dce756f diff --git a/tf-psa-crypto b/tf-psa-crypto index 35ae18cf89..8706d77f96 160000 --- a/tf-psa-crypto +++ b/tf-psa-crypto @@ -1 +1 @@ -Subproject commit 35ae18cf891d3675584da41f7e830f1de5f87f07 +Subproject commit 8706d77f9632eb2d3d0e58b713281f4232c1ee20 From 3de417fce26e95ae2cc047989106ac320a2bf9be Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Mon, 16 Jun 2025 15:03:42 +0200 Subject: [PATCH 07/13] scripts: generate_visualc_files.pl: prepare for Everest headers relocation This change allows the Perl script to manage Everest headers in tf-psa-crypto repo both before and after psa#235. Once psa#235 will be merged this commit can be simplified, i.e. it will be returned to its original state with paths of Everest headers updated. Signed-off-by: Valerio Setti --- scripts/generate_visualc_files.pl | 60 ++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/scripts/generate_visualc_files.pl b/scripts/generate_visualc_files.pl index 7ef46968b5..714abd739a 100755 --- a/scripts/generate_visualc_files.pl +++ b/scripts/generate_visualc_files.pl @@ -49,9 +49,20 @@ my $test_header_dir = 'framework/tests/include/test'; my $test_drivers_header_dir = 'framework/tests/include/test/drivers'; my $test_drivers_source_dir = 'framework/tests/src/drivers'; -my @thirdparty_header_dirs = qw( - tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest -); +# This is a dirty patch to allow mbedtls#10091 to be merged without updating +# tf-psa-crypto to psa#235. Once psa#235 will be merged, this dirty fix can +# be removed. +# The same holds also for @include_directories below. +my @thirdparty_header_dirs; +if (-d "tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest") { + @thirdparty_header_dirs = qw( + tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest + ); +} else { + @thirdparty_header_dirs = qw( + tf-psa-crypto/drivers/everest/include/everest + ); +} my @thirdparty_source_dirs = qw( tf-psa-crypto/drivers/everest/library tf-psa-crypto/drivers/everest/library/kremlib @@ -61,19 +72,36 @@ my @thirdparty_source_dirs = qw( # Directories to add to the include path. # Order matters in case there are files with the same name in more than # one directory: the compiler will use the first match. -my @include_directories = qw( - include - tf-psa-crypto/include - tf-psa-crypto/drivers/builtin/include - tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/ - tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest - tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest/vs2013 - tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest/kremlib - tests/include - tf-psa-crypto/tests/include - framework/tests/include - framework/tests/programs -); +my @include_directories; +if (-d "tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest") { + @include_directories = qw( + include + tf-psa-crypto/include + tf-psa-crypto/drivers/builtin/include + tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/ + tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest + tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest/vs2013 + tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest/kremlib + tests/include + tf-psa-crypto/tests/include + framework/tests/include + framework/tests/programs + ); +} else { + @include_directories = qw( + include + tf-psa-crypto/include + tf-psa-crypto/drivers/builtin/include + tf-psa-crypto/drivers/everest/include/ + tf-psa-crypto/drivers/everest/include/everest + tf-psa-crypto/drivers/everest/include/everest/vs2013 + tf-psa-crypto/drivers/everest/include/everest/kremlib + tests/include + tf-psa-crypto/tests/include + framework/tests/include + framework/tests/programs + ); +} my $include_directories = join(';', map {"../../$_"} @include_directories); # Directories to add to the include path when building the libraries, but not From 653a86dc2a36d6fa6b37ada91d9ca01a7ee63ff8 Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Mon, 16 Jun 2025 15:16:16 +0200 Subject: [PATCH 08/13] CMakeLists: prepare for Everest headers relocation Signed-off-by: Valerio Setti --- CMakeLists.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bda3977d07..84bed5aba3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -434,6 +434,14 @@ if(ENABLE_TESTING OR ENABLE_PROGRAMS) DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_keys.h) add_dependencies(mbedtls_test mbedtls_test_keys_header) endif() + # This is a dirty fix to allow mbedtls#10091 to be merged without psa#325. + # Once the latter will be merged, this can be simplified to just use + # the new path. + if(EXISTS "tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private") + set(EVEREST_HEADERS_PATH "tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private") + else() + set(EVEREST_HEADERS_PATH "tf-psa-crypto/drivers/everest/include") + endif() target_include_directories(mbedtls_test PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/tests/include PRIVATE ${MBEDTLS_FRAMEWORK_DIR}/tests/include @@ -441,7 +449,7 @@ if(ENABLE_TESTING OR ENABLE_PROGRAMS) PRIVATE include PRIVATE tf-psa-crypto/include PRIVATE tf-psa-crypto/drivers/builtin/include - PRIVATE tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/ + PRIVATE ${EVEREST_HEADERS_PATH} PRIVATE library PRIVATE tf-psa-crypto/core PRIVATE tf-psa-crypto/drivers/builtin/src) @@ -480,7 +488,7 @@ if(ENABLE_TESTING OR ENABLE_PROGRAMS) PRIVATE library PRIVATE tf-psa-crypto/core PRIVATE tf-psa-crypto/drivers/builtin/src - PRIVATE tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/) + PRIVATE ${EVEREST_HEADERS_PATH}) set_config_files_compile_definitions(mbedtls_test_helpers) endif() From 3150913be7e369de73b663af57cab429fe372997 Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Mon, 16 Jun 2025 15:34:33 +0200 Subject: [PATCH 09/13] Revert "update framework submodule to pull in everest changes" This reverts commit 83e5a7bf75ba8a24392ecdc93fe68f48fd56557a. Signed-off-by: Valerio Setti --- .gitmodules | 2 +- framework | 2 +- tf-psa-crypto | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7e34e96984..4612b3d0c9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,4 +3,4 @@ url = https://github.com/Mbed-TLS/mbedtls-framework [submodule "tf-psa-crypto"] path = tf-psa-crypto - url = git@github.com:bjwtaylor/TF-PSA-Crypto.git + url = https://github.com/Mbed-TLS/TF-PSA-Crypto.git diff --git a/framework b/framework index fdb0615d9a..1a83e0c84d 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit fdb0615d9a72c95cdf7f67e77bfcf0418dce756f +Subproject commit 1a83e0c84d4b7aa11c7cfd3771322486fc87d281 diff --git a/tf-psa-crypto b/tf-psa-crypto index 8706d77f96..35ae18cf89 160000 --- a/tf-psa-crypto +++ b/tf-psa-crypto @@ -1 +1 @@ -Subproject commit 8706d77f9632eb2d3d0e58b713281f4232c1ee20 +Subproject commit 35ae18cf891d3675584da41f7e830f1de5f87f07 From e4960bc15986b86d3d928344245ff3deadedd8ec Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Mon, 16 Jun 2025 15:35:07 +0200 Subject: [PATCH 10/13] framework: update reference Signed-off-by: Valerio Setti --- framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework b/framework index 1a83e0c84d..977db0c8bc 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 1a83e0c84d4b7aa11c7cfd3771322486fc87d281 +Subproject commit 977db0c8bcb083b436652d9339bd142f46bf64bb From 26893d99f67933bfe44db750045bf0f556fcb967 Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Tue, 17 Jun 2025 23:04:46 +0200 Subject: [PATCH 11/13] Revert "CMakeLists: prepare for Everest headers relocation" This reverts commit 653a86dc2a36d6fa6b37ada91d9ca01a7ee63ff8. Signed-off-by: Valerio Setti --- CMakeLists.txt | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 84bed5aba3..bda3977d07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -434,14 +434,6 @@ if(ENABLE_TESTING OR ENABLE_PROGRAMS) DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tests/include/test/test_keys.h) add_dependencies(mbedtls_test mbedtls_test_keys_header) endif() - # This is a dirty fix to allow mbedtls#10091 to be merged without psa#325. - # Once the latter will be merged, this can be simplified to just use - # the new path. - if(EXISTS "tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private") - set(EVEREST_HEADERS_PATH "tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private") - else() - set(EVEREST_HEADERS_PATH "tf-psa-crypto/drivers/everest/include") - endif() target_include_directories(mbedtls_test PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/tests/include PRIVATE ${MBEDTLS_FRAMEWORK_DIR}/tests/include @@ -449,7 +441,7 @@ if(ENABLE_TESTING OR ENABLE_PROGRAMS) PRIVATE include PRIVATE tf-psa-crypto/include PRIVATE tf-psa-crypto/drivers/builtin/include - PRIVATE ${EVEREST_HEADERS_PATH} + PRIVATE tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/ PRIVATE library PRIVATE tf-psa-crypto/core PRIVATE tf-psa-crypto/drivers/builtin/src) @@ -488,7 +480,7 @@ if(ENABLE_TESTING OR ENABLE_PROGRAMS) PRIVATE library PRIVATE tf-psa-crypto/core PRIVATE tf-psa-crypto/drivers/builtin/src - PRIVATE ${EVEREST_HEADERS_PATH}) + PRIVATE tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/) set_config_files_compile_definitions(mbedtls_test_helpers) endif() From f5e27fa3616f33b9662d830fa2b58b553401084a Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Tue, 17 Jun 2025 23:06:24 +0200 Subject: [PATCH 12/13] Revert "update further everest paths" This reverts commit 243b54f3869953a674ff6730685a623a98a1d9cd. Signed-off-by: Valerio Setti --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bda3977d07..a099356389 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -441,7 +441,7 @@ if(ENABLE_TESTING OR ENABLE_PROGRAMS) PRIVATE include PRIVATE tf-psa-crypto/include PRIVATE tf-psa-crypto/drivers/builtin/include - PRIVATE tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/ + PRIVATE tf-psa-crypto/drivers/everest/include PRIVATE library PRIVATE tf-psa-crypto/core PRIVATE tf-psa-crypto/drivers/builtin/src) @@ -480,7 +480,7 @@ if(ENABLE_TESTING OR ENABLE_PROGRAMS) PRIVATE library PRIVATE tf-psa-crypto/core PRIVATE tf-psa-crypto/drivers/builtin/src - PRIVATE tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/) + PRIVATE tf-psa-crypto/drivers/everest/include) set_config_files_compile_definitions(mbedtls_test_helpers) endif() From 2d7ded653fa6cab47b29870ce4623fd4e1814aad Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Wed, 18 Jun 2025 00:08:46 +0200 Subject: [PATCH 13/13] scripts: generate_visualc_files: fix include_directories Signed-off-by: Valerio Setti --- scripts/generate_visualc_files.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/generate_visualc_files.pl b/scripts/generate_visualc_files.pl index 714abd739a..5a18afc0c1 100755 --- a/scripts/generate_visualc_files.pl +++ b/scripts/generate_visualc_files.pl @@ -78,7 +78,7 @@ if (-d "tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest") { include tf-psa-crypto/include tf-psa-crypto/drivers/builtin/include - tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/ + tf-psa-crypto/drivers/everest/include/ tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest/vs2013 tf-psa-crypto/drivers/everest/include/tf-psa-crypto/private/everest/kremlib