Skip to content

Fix interoperability when MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE is disabled #9628

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

Merged
merged 20 commits into from
Sep 25, 2024
Merged

Fix interoperability when MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE is disabled #9628

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
1d6a950
opt-testcases/*.sh are not executable
gilles-peskine-arm Sep 13, 2024
7b02c1f
Avoid multiline requires_all_configs_xxx
gilles-peskine-arm Sep 13, 2024
73a406e
Separate accepting TLS 1.3 middlebox compatibility from sending it
gilles-peskine-arm Sep 13, 2024
671a439
Adapt middlebox compatibility tests for always-on acceptance
gilles-peskine-arm Sep 13, 2024
0f2d839
Remove mid-stanza blank lines
gilles-peskine-arm Sep 13, 2024
edc8f35
Remove obsolete requirements on middlebox compatibility mode: manual
gilles-peskine-arm Sep 13, 2024
ae5a35f
Remove obsolete requirements on middlebox compatibility mode: generated
gilles-peskine-arm Sep 13, 2024
c07beda
generate_tls13_compat_tests: change default mode to all
gilles-peskine-arm Sep 13, 2024
3943a1a
Automatically generate tests/opt-testcases/tls13-compat.sh
gilles-peskine-arm Sep 13, 2024
5dd839a
Fix sensitivity of tls13-compat.sh to the exact generation method
gilles-peskine-arm Sep 13, 2024
6f03eb8
Changelog entry: fix #9551
gilles-peskine-arm Sep 13, 2024
dfbc1a9
Remove transitional always-on internal option
gilles-peskine-arm Sep 13, 2024
9ca9b92
Reduce level of non-error debug message
gilles-peskine-arm Sep 13, 2024
1e01b4a
Remove obsolete requirement for GnuTLS %DISABLE_TLS13_COMPAT_MODE
gilles-peskine-arm Sep 19, 2024
907e495
Print a "Gen" line when generating a file
gilles-peskine-arm Sep 19, 2024
40c090f
Move generation of tls13-compat.sh to tests/CMakeLists.txt
gilles-peskine-arm Sep 19, 2024
fd6d279
CMake: generate tls13-compat.sh in the default build target
gilles-peskine-arm Sep 19, 2024
1150526
Fix copypasta
gilles-peskine-arm Sep 24, 2024
63068d6
Have `make ssl-opt` generate `tls13-compat.sh`
gilles-peskine-arm Sep 24, 2024
870ed2a
Have `make ssl-opt` generate `tls13-compat.sh` (make edition)
gilles-peskine-arm Sep 25, 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 CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,9 @@ if(ENABLE_TESTING OR ENABLE_PROGRAMS)
endif()

if(ENABLE_PROGRAMS)
set(ssl_opt_target "${MBEDTLS_TARGET_PREFIX}ssl-opt")
add_custom_target(${ssl_opt_target})

add_subdirectory(programs)
endif()

Expand Down
3 changes: 0 additions & 3 deletions programs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
set(programs_target "${MBEDTLS_TARGET_PREFIX}programs")
add_custom_target(${programs_target})

set(ssl_opt_target "${MBEDTLS_TARGET_PREFIX}ssl-opt")
add_custom_target(${ssl_opt_target})

add_subdirectory(aes)
add_subdirectory(cipher)
if (NOT WIN32)
Expand Down
1 change: 1 addition & 0 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ if(GEN_FILES)
add_custom_target(tls13-compat.sh
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/opt-testcases/tls13-compat.sh)
set_target_properties(tls13-compat.sh PROPERTIES EXCLUDE_FROM_ALL NO)
add_dependencies(${ssl_opt_target} tls13-compat.sh)
Copy link
Contributor

Choose a reason for hiding this comment

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

Actually wait, shouldn't we do something similar for make as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point! I'd only thought about it from the point of view of having already run make generated_files, which doesn't exist with CMake. But I do expect all make targets to work from a fresh checkout. Fixed.


else()
foreach(file ${all_generated_data_files})
Expand Down