Skip to content

Antalya 26.1: bump openssl to 3.5.6 #1650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zvonand wants to merge 1 commit into
base: antalya-26.1
Choose a base branch
from
+18 −8
Open

Antalya 26.1: bump openssl to 3.5.6 #1650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/openssl
Open in desktop
Submodule openssl updated 280 files
2 changes: 2 additions & 0 deletions contrib/openssl-cmake/common/include/openssl/cmp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions contrib/openssl-cmake/common/include/openssl/opensslv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 10 additions & 2 deletions tests/integration/test_dictionaries_ddl/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand Down
Loading