Skip to content

integrate tf-psa-crypto 1.x #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
valeriosetti wants to merge 4 commits into
base: zephyr_tf-psa-crypto_1.0.99_e5fdb3fe2
Choose a base branch
from
+8,668 −27
Open

integrate tf-psa-crypto 1.x #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e37cb7a
[zep noup] remove framework and mldsa-native subrepos
valeriosetti Mar 5, 2026
ed91dc7
[zep noup] do not configure Doxygen files
valeriosetti Feb 18, 2026
090d5f8
[zep noup] checkout automatically generated files
valeriosetti Mar 17, 2026
0a428b2
[zep noup] add removed modules back: DES, DHM and ECDH
valeriosetti Feb 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,5 @@ compile_commands.json

# VScode folder to store local debug files and configurations
.vscode

/drivers/pqcp/mldsa-native
6 changes: 0 additions & 6 deletions .gitmodules
View file
Open in desktop

This file was deleted.

19 changes: 7 additions & 12 deletions CMakeLists.txt
View file
Open in desktop
Copy link

@tejlmand tejlmand Mar 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[zep noup] is not an established syntax in Zephyr.

Copy link
Collaborator

@tomi-font tomi-font Mar 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is in the Mbed TLS/TF-M repos: https://github.com/zephyrproject-rtos/mbedtls/blob/zephyr_mbedtls_v3.6.5/README.md

Copy link
Collaborator Author

@valeriosetti valeriosetti Mar 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, being a submodule of Mbed TLS I followed the same rules specified in that README file.

Copy link

@tejlmand tejlmand Mar 18, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

already this commit, zephyrproject-rtos/mbedtls@c5b06d8, which changes the README file is violating the established workflow for handling Zephyr modules.

Zephyr module handling and synchronization was thoroughly discussed in the process wg group, as to have a uniform way of dealing with modules in Zephyr.
Image

Do not deviate from that by establishing your own rules.

@tomi-font If you want amendments to the rules, then that should be discussed in the relevant forum first.

A bit of history can be found here:
zephyrproject-rtos/zephyr#27185
https://docs.google.com/presentation/d/1okOQShAr3GZF7VOfRCGa9mw_L7Hyis-oH1kGUpOA66c/edit?userstoinvite=jettrink%40google.com&actionButton=1&slide=id.g81ec62ddd5_0_0#slide=id.g81ec62ddd5_0_0

Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ endif()
set(TF_PSA_CRYPTO_FRAMEWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR}/framework)

# Put the version numbers into relevant files
set(version_number_files
doxygen/input/doc_mainpage.h
doxygen/tfpsacrypto.doxyfile)
foreach(file ${version_number_files})
configure_file(${file}.in
${PROJECT_SOURCE_DIR}/${file})
endforeach(file)
# set(version_number_files
# doxygen/input/doc_mainpage.h
# doxygen/tfpsacrypto.doxyfile)
# foreach(file ${version_number_files})
# configure_file(${file}.in
# ${PROJECT_SOURCE_DIR}/${file})
# endforeach(file)
Comment on lines +69 to +75
Copy link

@tejlmand tejlmand Mar 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please read: https://docs.zephyrproject.org/latest/develop/modules.html#contributing-changes-to-modules

Submitting and merging changes directly to a module’s codebase, that is, before they have been merged in the corresponding external project repository, should be limited to:

  • changes required due to updates in the zephyr main tree
  • urgent changes that should not wait to be merged in the external project first, such as fixes to security vulnerabilities.

I'm not sure those changes are acceptable for a Zephyr patch.

If this is a problem, I suggest opening a PR upstream trying to make TF-PSA crypto more modular.

Copy link
Collaborator Author

@valeriosetti valeriosetti Mar 17, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to ping Mbed TLS developers on this, but I haven't received any answer so far. I will try to ping them again and if needed I will open a PR upstream to handle this gating this block of code with GEN_FILES.


ADD_CUSTOM_TARGET(${TF_PSA_CRYPTO_TARGET_PREFIX}tfpsacrypto-apidoc
COMMAND doxygen tfpsacrypto.doxyfile
Expand Down Expand Up @@ -396,10 +396,6 @@ if(CMAKE_BUILD_TYPE STREQUAL "Check" AND TEST_CPP)
endif()
endif()

if (NOT EXISTS "${TF_PSA_CRYPTO_FRAMEWORK_DIR}/CMakeLists.txt")
message(FATAL_ERROR "${TF_PSA_CRYPTO_FRAMEWORK_DIR}/CMakeLists.txt not found. Run `git submodule update --init` from the source tree to fetch the submodule contents.")
endif()

#
# Directories with internal headers. The headers in that directories are not
# exposed to applications and thus not installed. These headers are currently
Expand All @@ -421,7 +417,6 @@ set(TF_PSA_CRYPTO_PRIVATE_INCLUDE_DIRS
# constructed in `drivers/CMakeLists.txt`. This list may include a generated
# test driver.
#
add_subdirectory(framework)
add_subdirectory(include)
add_subdirectory(drivers) # must precede core
add_subdirectory(extras)
Expand Down
7 changes: 0 additions & 7 deletions core/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +0,0 @@
###START_GENERATED_FILES###
/psa_crypto_driver_wrappers.h
/psa_crypto_driver_wrappers_no_static.c
/tf_psa_crypto_config_check_before.h
/tf_psa_crypto_config_check_final.h
/tf_psa_crypto_config_check_user.h
###END_GENERATED_FILES###
Loading