Skip to content
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

Switch from test-ref-configs.pl to separate components #9565

Merged
merged 12 commits into from
Sep 24, 2024
Merged

Switch from test-ref-configs.pl to separate components #9565

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5dab92e
CMake: support "make programs"
gilles-peskine-arm Sep 14, 2024
b630648
CMake: support "make ssl-opt" to just build what ssl-opt.sh needs
gilles-peskine-arm Sep 14, 2024
d001f58
make: support "make ssl-opt" to just build what ssl-opt.sh needs
gilles-peskine-arm Sep 14, 2024
063fb8c
Move config-ccm-psk-tls1_2.h testing to separate all.sh components
gilles-peskine-arm Sep 14, 2024
68f511e
Move config-ccm-psk-dtls1_2.h testing to separate all.sh components
gilles-peskine-arm Sep 14, 2024
b6d4913
Move config-suite-b.h testing to separate all.sh components
gilles-peskine-arm Sep 14, 2024
86ceb13
Move config-thread.h testing to separate all.sh components
gilles-peskine-arm Sep 14, 2024
af5a899
Move config-symmetric-only.h testing to separate all.sh components
gilles-peskine-arm Sep 14, 2024
effa6a0
Move config-tfm.h testing to separate all.sh component
gilles-peskine-arm Sep 14, 2024
2e449f0
Remove test-ref-configs.pl, which no longer does anything
gilles-peskine-arm Sep 14, 2024
e7422a1
Remove legacy-crypto components that come from test-ref-configs
gilles-peskine-arm Sep 19, 2024
ea5de2b
Simplify psa-crypto components that come from test-ref-configs
gilles-peskine-arm Sep 19, 2024
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
3 changes: 3 additions & 0 deletions programs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
set(programs_target "${MBEDTLS_TARGET_PREFIX}programs")
add_custom_target(${programs_target})

set(ssl_opt_target "${MBEDTLS_TARGET_PREFIX}ssl-opt")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

ssl-opt should also generate tls13-compat.sh which is added by #9563. This can only be done once both parts of the code are in — reminder to make a follow-up PR.

add_custom_target(${ssl_opt_target})

add_subdirectory(aes)
add_subdirectory(cipher)
if (NOT WIN32)
Expand Down
1 change: 1 addition & 0 deletions programs/ssl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ set(executables
ssl_server2
)
add_dependencies(${programs_target} ${executables})
add_dependencies(${ssl_opt_target} ${executables})

if(GEN_FILES)
# Inform CMake that the following file will be generated as part of the build
Expand Down
2 changes: 2 additions & 0 deletions programs/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ set(executables_libs
udp_proxy
)
add_dependencies(${programs_target} ${executables_libs})
add_dependencies(${ssl_opt_target} udp_proxy)

set(executables_mbedcrypto
benchmark
query_compile_time_config
zeroize
)
add_dependencies(${programs_target} ${executables_mbedcrypto})
add_dependencies(${ssl_opt_target} query_compile_time_config)

if(TEST_CPP)
set(cpp_dummy_build_cpp "${CMAKE_CURRENT_BINARY_DIR}/cpp_dummy_build.cpp")
Expand Down