From 68547c5dc7b23b838709dcfcd26e10183227240b Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Wed, 6 Dec 2023 08:37:18 +0200 Subject: [PATCH] libssh2: bump mbedtls --- recipes/libssh2/all/conanfile.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes/libssh2/all/conanfile.py b/recipes/libssh2/all/conanfile.py index 6da888df38a6f..3ccfe30d867cc 100644 --- a/recipes/libssh2/all/conanfile.py +++ b/recipes/libssh2/all/conanfile.py @@ -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" @@ -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)