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

libssh2: bump mbedtls #21631

Merged
merged 1 commit into from
Dec 11, 2023
Merged
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions recipes/libssh2/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from conan.tools.cmake import CMake, CMakeToolchain, CMakeDeps, cmake_layout
from conan.tools.files import apply_conandata_patches, export_conandata_patches, get, copy, rmdir, collect_libs
from conan.tools.microsoft import is_msvc
from conan.tools.scm import Version
import os

required_conan_version = ">=1.53.0"
Expand Down Expand Up @@ -84,8 +85,10 @@ def requirements(self):
if self.options.crypto_backend == "openssl":
self.requires("openssl/[>=1.1 <4]")
elif self.options.crypto_backend == "mbedtls":
# libssh2/<=1.10.0 doesn't support mbedtls/3.x.x
self.requires("mbedtls/2.25.0")
if Version(self.version) >= "1.11":
self.requires("mbedtls/3.5.0")
else:
self.requires("mbedtls/2.28.4")

def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True)
Expand Down