From e8696b62cecee12a5c9e6bb427a1d3a1b94a9202 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@clickhouse.com>
Date: Sat, 30 Sep 2023 06:45:19 +0300
Subject: [PATCH] Revert "Fix libssh+openssl3 & s390x (part 2)"

---
 contrib/libssh                            | 2 +-
 contrib/libssh-cmake/IncludeSources.cmake | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/libssh b/contrib/libssh
index 2c76332ef56..acea3e2d5ad 160000
--- a/contrib/libssh
+++ b/contrib/libssh
@@ -1 +1 @@
-Subproject commit 2c76332ef56d90f55965ab24da6b6dbcbef29c4c
+Subproject commit acea3e2d5ad6e22f52961b43411b4ed2d9224b9e
diff --git a/contrib/libssh-cmake/IncludeSources.cmake b/contrib/libssh-cmake/IncludeSources.cmake
index ca5d0218c24..b60d8ed6c3c 100644
--- a/contrib/libssh-cmake/IncludeSources.cmake
+++ b/contrib/libssh-cmake/IncludeSources.cmake
@@ -101,8 +101,8 @@ set(libssh_SRCS
     ${LIB_SOURCE_DIR}/src/dh_crypto.c
 )
 
-if (NOT (ENABLE_OPENSSL OR ENABLE_OPENSSL_DYNAMIC))
-    add_compile_definitions(USE_BORINGSSL=1)
+# see the comment on s390x in libssh-cmake/CMakeLists.txt
+if(OPENSSL_VERSION VERSION_LESS "1.1.0" AND NOT ARCH_S390X)
     set(libssh_SRCS ${libssh_SRCS} ${LIB_SOURCE_DIR}/src/libcrypto-compat.c)
 endif()