mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-21 23:21:59 +00:00
Fix krb5 with openssl
This commit is contained in:
parent
db864891f8
commit
76738017a8
@ -15,10 +15,6 @@ if(NOT AWK_PROGRAM)
|
|||||||
message(FATAL_ERROR "You need the awk program to build ClickHouse with krb5 enabled.")
|
message(FATAL_ERROR "You need the awk program to build ClickHouse with krb5 enabled.")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (NOT (ENABLE_OPENSSL OR ENABLE_OPENSSL_DYNAMIC))
|
|
||||||
add_compile_definitions(USE_BORINGSSL=1)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
set(KRB5_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/krb5/src")
|
set(KRB5_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/krb5/src")
|
||||||
set(KRB5_ET_BIN_DIR "${CMAKE_CURRENT_BINARY_DIR}/include_private")
|
set(KRB5_ET_BIN_DIR "${CMAKE_CURRENT_BINARY_DIR}/include_private")
|
||||||
|
|
||||||
@ -162,6 +158,11 @@ set(ALL_SRCS
|
|||||||
|
|
||||||
"${KRB5_SOURCE_DIR}/lib/crypto/builtin/kdf.c"
|
"${KRB5_SOURCE_DIR}/lib/crypto/builtin/kdf.c"
|
||||||
"${KRB5_SOURCE_DIR}/lib/crypto/builtin/cmac.c"
|
"${KRB5_SOURCE_DIR}/lib/crypto/builtin/cmac.c"
|
||||||
|
"${KRB5_SOURCE_DIR}/lib/crypto/builtin/des/des_keys.c"
|
||||||
|
"${KRB5_SOURCE_DIR}/lib/crypto/builtin/des/f_parity.c"
|
||||||
|
"${KRB5_SOURCE_DIR}/lib/crypto/builtin/enc_provider/rc4.c"
|
||||||
|
"${KRB5_SOURCE_DIR}/lib/crypto/builtin/hash_provider/hash_md4.c"
|
||||||
|
"${KRB5_SOURCE_DIR}/lib/crypto/builtin/md4/md4.c"
|
||||||
"${KRB5_SOURCE_DIR}/lib/crypto/krb/prng.c"
|
"${KRB5_SOURCE_DIR}/lib/crypto/krb/prng.c"
|
||||||
"${KRB5_SOURCE_DIR}/lib/crypto/krb/enc_dk_cmac.c"
|
"${KRB5_SOURCE_DIR}/lib/crypto/krb/enc_dk_cmac.c"
|
||||||
# "${KRB5_SOURCE_DIR}/lib/crypto/krb/crc32.c"
|
# "${KRB5_SOURCE_DIR}/lib/crypto/krb/crc32.c"
|
||||||
@ -226,7 +227,6 @@ set(ALL_SRCS
|
|||||||
# "${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/des.c"
|
# "${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/des.c"
|
||||||
"${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/rc4.c"
|
"${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/rc4.c"
|
||||||
"${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/des3.c"
|
"${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/des3.c"
|
||||||
#"${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/camellia.c"
|
|
||||||
"${KRB5_SOURCE_DIR}/lib/crypto/openssl/cmac.c"
|
"${KRB5_SOURCE_DIR}/lib/crypto/openssl/cmac.c"
|
||||||
"${KRB5_SOURCE_DIR}/lib/crypto/openssl/sha256.c"
|
"${KRB5_SOURCE_DIR}/lib/crypto/openssl/sha256.c"
|
||||||
"${KRB5_SOURCE_DIR}/lib/crypto/openssl/hmac.c"
|
"${KRB5_SOURCE_DIR}/lib/crypto/openssl/hmac.c"
|
||||||
@ -474,6 +474,14 @@ set(ALL_SRCS
|
|||||||
"${KRB5_SOURCE_DIR}/lib/krb5/krb5_libinit.c"
|
"${KRB5_SOURCE_DIR}/lib/krb5/krb5_libinit.c"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (NOT (ENABLE_OPENSSL OR ENABLE_OPENSSL_DYNAMIC))
|
||||||
|
add_compile_definitions(USE_BORINGSSL=1)
|
||||||
|
else()
|
||||||
|
set(ALL_SRCS ${ALL_SRCS}
|
||||||
|
"${KRB5_SOURCE_DIR}/lib/crypto/openssl/enc_provider/camellia.c"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/compile_et"
|
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/compile_et"
|
||||||
COMMAND /bin/sh
|
COMMAND /bin/sh
|
||||||
@ -673,6 +681,7 @@ target_include_directories(_krb5 PRIVATE
|
|||||||
"${KRB5_SOURCE_DIR}/lib/gssapi/krb5"
|
"${KRB5_SOURCE_DIR}/lib/gssapi/krb5"
|
||||||
"${KRB5_SOURCE_DIR}/lib/gssapi/spnego"
|
"${KRB5_SOURCE_DIR}/lib/gssapi/spnego"
|
||||||
"${KRB5_SOURCE_DIR}/util/et"
|
"${KRB5_SOURCE_DIR}/util/et"
|
||||||
|
"${KRB5_SOURCE_DIR}/lib/crypto/builtin/md4"
|
||||||
"${KRB5_SOURCE_DIR}/lib/crypto/openssl"
|
"${KRB5_SOURCE_DIR}/lib/crypto/openssl"
|
||||||
"${KRB5_SOURCE_DIR}/lib/crypto/krb"
|
"${KRB5_SOURCE_DIR}/lib/crypto/krb"
|
||||||
"${KRB5_SOURCE_DIR}/util/profile"
|
"${KRB5_SOURCE_DIR}/util/profile"
|
||||||
|
Loading…
Reference in New Issue
Block a user