thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-23 16:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55188 from ClickHouse/revert-55187-libssh_fixes

Browse Source 
Revert "Fix libssh+openssl3 & s390x (part 2)"
This commit is contained in:
Alexey Milovidov 2023-09-30 06:45:27 +03:00 committed by GitHub
commit e39a5e4c63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/libssh vendored

@ -1 +1 @@
Subproject commit 2c76332ef56d90f55965ab24da6b6dbcbef29c4c
Subproject commit acea3e2d5ad6e22f52961b43411b4ed2d9224b9e

4
contrib/libssh-cmake/IncludeSources.cmake
View File

@ -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()