This is an automated email from the ASF dual-hosted git repository.
szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/main by this push:
new cd3515c35 MINIFICPP-2921 Update OpenSSL3 to version 3.6.5 (#2280)
cd3515c35 is described below
commit cd3515c35c89439ccd2a9e7d40f7260c9a7388b7
Author: Gabor Gyimesi <[email protected]>
AuthorDate: Fri Oct 9 16:34:27 2026 +0200
MINIFICPP-2921 Update OpenSSL3 to version 3.6.5 (#2280)
---
cmake/BundledOpenSSL.cmake | 6 +++---
conanfile.py | 2 +-
thirdparty/aws-sdk-cpp/all/conanfile.py | 2 +-
thirdparty/azure-sdk-cpp/all/conanfile.py | 2 +-
thirdparty/google-cloud-cpp/all/conanfile.py | 2 +-
thirdparty/kubernetes-client-c/all/conanfile.py | 2 +-
thirdparty/paho-mqtt/all/conanfile.py | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/cmake/BundledOpenSSL.cmake b/cmake/BundledOpenSSL.cmake
index 04a215827..8cb00d816 100644
--- a/cmake/BundledOpenSSL.cmake
+++ b/cmake/BundledOpenSSL.cmake
@@ -78,7 +78,7 @@ function(use_openssl SOURCE_DIR BINARY_DIR)
"-DCMAKE_VISIBILITY_INLINES_HIDDEN=ON"
)
- set(OPENSSL_VERSION "3.6.2" CACHE STRING "" FORCE)
+ set(OPENSSL_VERSION "3.6.5" CACHE STRING "" FORCE)
if (WIN32)
find_program(JOM_EXECUTABLE_PATH
@@ -98,7 +98,7 @@ function(use_openssl SOURCE_DIR BINARY_DIR)
ExternalProject_Add(
openssl-external
URL
"https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VERSION}/openssl-${OPENSSL_VERSION}.tar.gz";
- URL_HASH
"SHA256=aaf51a1fe064384f811daeaeb4ec4dce7340ec8bd893027eee676af31e83a04f"
+ URL_HASH
"SHA256=a2157c2830efdec3788939b00c9b0638306d3f0bbb76dc4832ee503bb397df98"
SOURCE_DIR "${BINARY_DIR}/thirdparty/openssl-src"
BUILD_IN_SOURCE true
CONFIGURE_COMMAND perl Configure "CC=${CMAKE_C_COMPILER}"
"CXX=${CMAKE_CXX_COMPILER}" "CFLAGS=${OPENSSL_C_FLAGS}
${OPENSSL_WINDOWS_COMPILE_FLAGS}" "CXXFLAGS=${PASSTHROUGH_CMAKE_CXX_FLAGS}
${OPENSSL_WINDOWS_COMPILE_FLAGS}" ${OPENSSL_SHARED_FLAG} ${OPENSSL_EXTRA_FLAGS}
"--prefix=${OPENSSL_BIN_DIR}" "--openssldir=${OPENSSL_BIN_DIR}"
@@ -113,7 +113,7 @@ function(use_openssl SOURCE_DIR BINARY_DIR)
ExternalProject_Add(
openssl-external
URL
"https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VERSION}/openssl-${OPENSSL_VERSION}.tar.gz";
- URL_HASH
"SHA256=aaf51a1fe064384f811daeaeb4ec4dce7340ec8bd893027eee676af31e83a04f"
+ URL_HASH
"SHA256=a2157c2830efdec3788939b00c9b0638306d3f0bbb76dc4832ee503bb397df98"
SOURCE_DIR "${BINARY_DIR}/thirdparty/openssl-src"
BUILD_IN_SOURCE true
CONFIGURE_COMMAND ./Configure "CC=${CMAKE_C_COMPILER}"
"CXX=${CMAKE_CXX_COMPILER}" "CFLAGS=${OPENSSL_C_FLAGS} -fPIC"
"CXXFLAGS=${PASSTHROUGH_CMAKE_CXX_FLAGS} -fPIC" ${OPENSSL_SHARED_FLAG}
${OPENSSL_EXTRA_FLAGS} "--prefix=${OPENSSL_BIN_DIR}"
"--openssldir=${OPENSSL_BIN_DIR}"
diff --git a/conanfile.py b/conanfile.py
index 18276242e..08f3d9233 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -164,7 +164,7 @@ class MiNiFiCppMain(ConanFile):
self.requires("asio/1.38.0", force=True)
self.requires("lz4/1.10.0", force=True)
self.requires("libcurl/8.20.0", force=True)
- self.requires("openssl/3.6.2", force=True)
+ self.requires("openssl/3.6.5", force=True)
self.requires("openssl-fips/3.1.2@minifi/develop")
self.requires("zlib/1.3.2", force=True)
self.requires("nlohmann_json/3.12.0", force=True)
diff --git a/thirdparty/aws-sdk-cpp/all/conanfile.py
b/thirdparty/aws-sdk-cpp/all/conanfile.py
index f42b813ea..170ff1834 100644
--- a/thirdparty/aws-sdk-cpp/all/conanfile.py
+++ b/thirdparty/aws-sdk-cpp/all/conanfile.py
@@ -495,7 +495,7 @@ class AwsSdkCppConan(ConanFile):
cmake_layout(self, src_folder="src")
def requirements(self):
- self.requires("openssl/3.6.2", transitive_headers=True)
+ self.requires("openssl/3.6.5", transitive_headers=True)
if self.settings.os != "Windows":
# Used transitively in core/http/curl/CurlHandleContainer.h public
header
self.requires("libcurl/8.20.0", transitive_headers=True)
diff --git a/thirdparty/azure-sdk-cpp/all/conanfile.py
b/thirdparty/azure-sdk-cpp/all/conanfile.py
index 8b15856de..9b166df40 100644
--- a/thirdparty/azure-sdk-cpp/all/conanfile.py
+++ b/thirdparty/azure-sdk-cpp/all/conanfile.py
@@ -69,7 +69,7 @@ class AzureSDKForCppConan(ConanFile):
self.options.rm_safe("fPIC")
def requirements(self):
- self.requires("openssl/3.6.2")
+ self.requires("openssl/3.6.5")
self.requires("libxml2/2.15.3")
if self.settings.os == "Windows":
diff --git a/thirdparty/google-cloud-cpp/all/conanfile.py
b/thirdparty/google-cloud-cpp/all/conanfile.py
index fcc16e5dc..7dd022509 100644
--- a/thirdparty/google-cloud-cpp/all/conanfile.py
+++ b/thirdparty/google-cloud-cpp/all/conanfile.py
@@ -96,7 +96,7 @@ class GoogleCloudCppConan(ConanFile):
self.requires("nlohmann_json/3.12.0")
self.requires("crc32c/1.1.2")
self.requires("libcurl/8.20.0")
- self.requires("openssl/3.6.2")
+ self.requires("openssl/3.6.5")
self.requires("zlib/1.3.2")
if self.options.with_mocks:
self.requires("gtest/1.17.0", transitive_headers=True)
diff --git a/thirdparty/kubernetes-client-c/all/conanfile.py
b/thirdparty/kubernetes-client-c/all/conanfile.py
index e67e9a8b9..10bf28295 100644
--- a/thirdparty/kubernetes-client-c/all/conanfile.py
+++ b/thirdparty/kubernetes-client-c/all/conanfile.py
@@ -48,7 +48,7 @@ class kubernetesRecipe(ConanFile):
def requirements(self):
self.requires("libcurl/8.20.0", transitive_headers=True)
- self.requires("openssl/3.6.2")
+ self.requires("openssl/3.6.5")
self.requires("libwebsockets/4.3.2", transitive_headers=True)
self.requires("libyaml/0.2.5")
diff --git a/thirdparty/paho-mqtt/all/conanfile.py
b/thirdparty/paho-mqtt/all/conanfile.py
index 9cea38432..9778a159f 100644
--- a/thirdparty/paho-mqtt/all/conanfile.py
+++ b/thirdparty/paho-mqtt/all/conanfile.py
@@ -68,7 +68,7 @@ class PahoMqttcConan(ConanFile):
def requirements(self):
if self.options.ssl:
# Headers are exposed
https://github.com/eclipse/paho.mqtt.c/blob/f7799da95e347bbc930b201b52a1173ebbad45a7/src/SSLSocket.h#L29
- self.requires("openssl/3.6.2", transitive_headers=True)
+ self.requires("openssl/3.6.5", transitive_headers=True)
def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True)
