From 62ffa81169d8374f5e3bc4ac36ba755bbeda9a1b Mon Sep 17 00:00:00 2001 From: Gareth Sylvester-Bradley Date: Thu, 28 Apr 2022 16:21:14 +0100 Subject: [PATCH] Bump OpenSSL to 1.1.1n --- Development/conanfile.txt | 2 +- Documents/Dependencies.md | 4 ++-- Sandbox/conan-recipe/conanfile.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Development/conanfile.txt b/Development/conanfile.txt index 99f91bc70..23015841f 100644 --- a/Development/conanfile.txt +++ b/Development/conanfile.txt @@ -2,7 +2,7 @@ boost/1.78.0 cpprestsdk/2.10.18 websocketpp/0.8.2 -openssl/1.1.1m +openssl/1.1.1n json-schema-validator/2.1.0 [imports] diff --git a/Documents/Dependencies.md b/Documents/Dependencies.md index 99cbacfc8..332262038 100644 --- a/Documents/Dependencies.md +++ b/Documents/Dependencies.md @@ -59,7 +59,7 @@ By default nmos-cpp uses [Conan](https://conan.io) to download most of its depen - On some platforms with Python 2 and Python 3 both installed this may need to be `pip3 install conan` - Currently, Conan 1.43 or higher is required; version 1.45 (latest release at the time) has been tested - Conan evolves fairly quickly, so it's worth running `pip install --upgrade conan` regularly - - By default [Conan assumes semver compatibility](https://docs.conan.io/en/1.42/creating_packages/define_abi_compatibility.html#versioning-schema). + - By default [Conan assumes semver compatibility](https://docs.conan.io/en/1.42/creating_packages/define_abi_compatibility.html#versioning-schema). Boost and other C++ libraries do not meet this expectation and break ABI compatibility between e.g. minor versions. Unfortunately, the recipes in Conan Center Index do not generally customize their `package_id` method to take this into account. Therefore it is strongly recommended to change Conan's default package id mode to `minor_mode` or a stricter mode such as `recipe_revision_mode`. @@ -240,7 +240,7 @@ It is also possible to use OpenSSL 1.0, but the OpenSSL team announced that [use 1. Download and install a recent release Notes: - On Windows, an installer can be downloaded from [Shining Light Productions - Win32 OpenSSL](https://slproweb.com/products/Win32OpenSSL.html) - The Win64 OpenSSL v1.1.1m installer (latest release at the time) has been tested + The Win64 OpenSSL v1.1.1n installer (latest release at the time) has been tested - On Linux distributions, an OpenSSL package may already be available The Ubuntu team announced an [OpenSSL 1.1.1 stable release update (SRU) for Ubuntu 18.04 LTS](https://lists.ubuntu.com/archives/ubuntu-devel/2018-December/040567.html) diff --git a/Sandbox/conan-recipe/conanfile.py b/Sandbox/conan-recipe/conanfile.py index a44f4098a..a363c3a3b 100644 --- a/Sandbox/conan-recipe/conanfile.py +++ b/Sandbox/conan-recipe/conanfile.py @@ -48,7 +48,7 @@ def requirements(self): self.requires("boost/1.78.0") self.requires("cpprestsdk/2.10.18") self.requires("websocketpp/0.8.2") - self.requires("openssl/1.1.1m") + self.requires("openssl/1.1.1n") self.requires("json-schema-validator/2.1.0") def build_requirements(self):