diff --git a/changelog.md b/changelog.md index f5b3808..9d61672 100644 --- a/changelog.md +++ b/changelog.md @@ -5,6 +5,7 @@ - Fixed packaging error on Windows when the Conan cache path contains spaces. - Fixed Python include dirs being added twice (didn't cause any issues, just noise on the command line). - Fixed `openssl` v3 mistakenly being enabled for Python 3.10. While 3.10 has preliminary support for `openssl` v3, Python 3.11 is the real minimum requirement for full support. +- Bumped default `openssl` to 1.1.1w for Python < 3.11 and v3.1.2 for Python >= 3.11. ## v1.8.0 | 2023-07-12 diff --git a/core/conanfile.py b/core/conanfile.py index f401f81..414389e 100644 --- a/core/conanfile.py +++ b/core/conanfile.py @@ -62,13 +62,10 @@ def requirements(self): else: self.requires("mpdecimal/2.5.0") - # `openssl` v3.1.1 is no-go for macOS ARM: https://github.com/openssl/openssl/issues/20753 - # The fix will be in v3.1.2: https://github.com/openssl/openssl/pull/21261 - # Go with v3.0.8 until this is resolved. if self.pyversion >= scm.Version("3.11.0"): - self.requires("openssl/3.0.8") + self.requires("openssl/3.1.2") else: - self.requires("openssl/1.1.1u") + self.requires("openssl/1.1.1w") @property def pyversion(self):