Repository navigation
Conversation
Select the SHA and TLS version APIs using MBEDTLS_VERSION_NUMBER so the existing 3.x path remains unchanged. Try the upstream CMake config first and fall back to pkg-config only when it is unavailable. Apply the same changes to both GXFP source copies.
This file contains hidden or 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
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.
Summary
MBEDTLS_VERSION_NUMBER: use the_retfunctions on Mbed TLS 2.x and preserve the existing functions on 3.x.min_tls_version/max_tls_versioncalls on 3.x and use the corresponding 2.x API only on older versions.MbedTLSConfig.cmakefirst. Add the pkg-config-basedFindMbedTLS.cmakeonly as a fallback for distributions such as Deepin 25.3 that provide pkg-config metadata but no CMake package config.Testing
Tested locally on Deepin 25.3.0 with Mbed TLS 2.28.8:
cmake -S userspace -B build/userspace -DCMAKE_BUILD_TYPE=Releasecmake --build build/userspace -j2ctest --test-dir build/userspace --output-on-failure— 1/1 passedmeson test -C build/libfprint --print-errorlogs— 5 passed, 20 skipped by the existing build configurationMbedTLSConfig.cmakeconfirmed that the config package is selected before the pkg-config fallback.I could only test Mbed TLS 2.28 locally. The 3.x path is intentionally unchanged and should be covered by the existing Arch CI build.
Related: #26