From cde1e06db4218721c74f3c51e45d6ac2bac71e19 Mon Sep 17 00:00:00 2001 From: Konstantin Bogdanov Date: Wed, 15 Apr 2026 01:48:06 +0000 Subject: [PATCH] Merge pull request #102606 from ClickHouse/bump-openssl-3.5.6 Use `openssl` 3.5.6 --- contrib/openssl | 2 +- contrib/openssl-cmake/common/include/openssl/cmp.h | 2 ++ .../openssl-cmake/common/include/openssl/opensslv.h | 10 +++++----- tests/integration/test_dictionaries_ddl/test.py | 12 ++++++++++-- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/contrib/openssl b/contrib/openssl index 200f52fba04f..d0f95dba4cb0 160000 --- a/contrib/openssl +++ b/contrib/openssl @@ -1 +1 @@ -Subproject commit 200f52fba04fa7b0c9e27fc75f3ce72b6f2f9276 +Subproject commit d0f95dba4cb06e912c131d64ec77acb20d270fd1 diff --git a/contrib/openssl-cmake/common/include/openssl/cmp.h b/contrib/openssl-cmake/common/include/openssl/cmp.h index 05aed3029d59..fff7ea754c17 100644 --- a/contrib/openssl-cmake/common/include/openssl/cmp.h +++ b/contrib/openssl-cmake/common/include/openssl/cmp.h @@ -194,6 +194,8 @@ typedef ASN1_BIT_STRING OSSL_CMP_PKIFAILUREINFO; * -- CertReqMsg * } */ +# define OSSL_CMP_PKISTATUS_rejected_by_client -5 +# define OSSL_CMP_PKISTATUS_checking_response -4 # define OSSL_CMP_PKISTATUS_request -3 # define OSSL_CMP_PKISTATUS_trans -2 # define OSSL_CMP_PKISTATUS_unspecified -1 diff --git a/contrib/openssl-cmake/common/include/openssl/opensslv.h b/contrib/openssl-cmake/common/include/openssl/opensslv.h index 4b628b6f49e3..110c34de0e46 100644 --- a/contrib/openssl-cmake/common/include/openssl/opensslv.h +++ b/contrib/openssl-cmake/common/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 5 -# define OPENSSL_VERSION_PATCH 0 +# define OPENSSL_VERSION_PATCH 6 /* * Additional version information @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.5.0" -# define OPENSSL_FULL_VERSION_STR "3.5.0" +# define OPENSSL_VERSION_STR "3.5.6" +# define OPENSSL_FULL_VERSION_STR "3.5.6" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "8 Apr 2025" +# define OPENSSL_RELEASE_DATE "7 Apr 2026" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.5.0 8 Apr 2025" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.5.6 7 Apr 2026" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/tests/integration/test_dictionaries_ddl/test.py b/tests/integration/test_dictionaries_ddl/test.py index 85beda5af81f..6d455b8c07f3 100644 --- a/tests/integration/test_dictionaries_ddl/test.py +++ b/tests/integration/test_dictionaries_ddl/test.py @@ -590,7 +590,11 @@ def test_secure(started_cluster): ) with pytest.raises(QueryRuntimeException) as excinfo: node1.query("SELECT dictGet('test.clickhouse_secure', 'value', toUInt64(1))") - assert "Unexpected packet from server localhost:9440" in str(excinfo.value) + error = str(excinfo.value) + assert ( + "Unexpected packet from server localhost:9440" in error + or "Connection reset by peer" in error + ) # Secure is set to 0 in named collection node1.query("DROP DICTIONARY IF EXISTS test.clickhouse_secure") @@ -611,7 +615,11 @@ def test_secure(started_cluster): ) with pytest.raises(QueryRuntimeException) as excinfo: node1.query("SELECT dictGet('test.clickhouse_secure', 'value', toUInt64(1))") - assert "Unexpected packet from server localhost:9440" in str(excinfo.value) + error = str(excinfo.value) + assert ( + "Unexpected packet from server localhost:9440" in error + or "Connection reset by peer" in error + ) # Secure is set to 0 in named collection and in 1 in DDL node1.query("DROP DICTIONARY IF EXISTS test.clickhouse_secure")