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.

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

fix: link bcrypt on Windows when mbedtls >=v3.5.0 #2860

Merged
merged 1 commit into from
Mar 7, 2024

Conversation

tommyvct
Copy link
Contributor

PR #2842 doens't fix the problem in all cases. This PR will only link to bcrypt if mbedtls is not found by find_package(mbedtls).

PR Haivision#2842 doens't fix the problem in all cases. This PR will only link to bcrypt if mbedtls is not found by find_package(mbedtls).
@tommyvct
Copy link
Contributor Author

CC @maxsharabayko @wangyoucao577

@wangyoucao577
Copy link
Contributor

Oh, I didn't cover that branch because I saw it exist for WIN32 already, see https://github.com/Mbed-TLS/mbedtls/blob/fb12d9204dec811d0277a09bd93f9d745f44ce9f/library/CMakeLists.txt#L218-L220 which has been added in PR Mbed-TLS/mbedtls#8047. On the other hand, I saw it in the generated cmake config file MbedTLSTargets.cmake:
image

But I indeed didn't test it. If it's not work on find_package, maybe it's better to fix it on MbedTLS side?

@maxsharabayko maxsharabayko added this to the v1.5.4 milestone Jan 22, 2024
@maxsharabayko maxsharabayko added Type: Bug Indicates an unexpected problem or unintended behavior [build] Area: Changes in build files labels Jan 22, 2024
Copy link

codecov bot commented Mar 7, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.37%. Comparing base (2eb47e3) to head (daff78e).
Report is 21 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2860      +/-   ##
==========================================
+ Coverage   66.56%   67.37%   +0.81%     
==========================================
  Files         103      103              
  Lines       20443    20538      +95     
==========================================
+ Hits        13608    13838     +230     
+ Misses       6835     6700     -135     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@maxsharabayko
Copy link
Collaborator

The Android NDK-R23 github action failed, but on downloading OpenSSL. Not related to this PR. And I already can't re-run it.
As there were no objection to this fix, merging.

@maxsharabayko maxsharabayko merged commit 618ddfe into Haivision:master Mar 7, 2024
10 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[build] Area: Changes in build files Type: Bug Indicates an unexpected problem or unintended behavior
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants