mirror of
https://github.com/hanzoai/datastore.git
synced 2026-09-26 13:55:07 +00:00
Konstantin BogdanovandClaude Opus 4.8
09b249b939
Update the `contrib/libssh` submodule from an upstream master snapshot (`libssh-0.11.0-368-g47305a2f`) to the upstream release `libssh-0.12.0`, tracked via the `ClickHouse/libssh-0.12.0` branch of the fork mirror. Both the old and new pins are clean upstream commits, so no ClickHouse patches needed to be carried forward. Build integration changes in `contrib/libssh-cmake`: - Bump the `libssh_VERSION_*` variables to 0.12.0. - Add the new ML-KEM sources to the build. In 0.12.0, `kex.c` references `ssh_client_hybrid_mlkem_remove_callbacks` from an unguarded switch case, so `hybrid_mlkem.c` and `mlkem.c` are now mandatory. ClickHouse bundles OpenSSL 3.5, which provides the EVP ML-KEM API, so the OpenSSL backend `mlkem_crypto.c` is used (matching upstream's `OPENSSL_VERSION >= 3.5.0` logic). - In every per-platform `config.h`: define `GLOBAL_CONF_DIR` (now used unconditionally via string concatenation in `options.c`), and enable `HAVE_OPENSSL_MLKEM` / `HAVE_MLKEM1024` to select the OpenSSL ML-KEM backend and the ML-KEM-1024 variants. Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
300 lines
8.7 KiB
C++
300 lines
8.7 KiB
C++
/* Name of package */
|
|
#define PACKAGE "libssh"
|
|
|
|
/* Version number of package */
|
|
#define VERSION "0.9.7"
|
|
|
|
#define SYSCONFDIR "etc"
|
|
#define BINARYDIR "/home/ubuntu/workdir/ClickHouse/build/s390x"
|
|
#define SOURCEDIR "/home/ubuntu/workdir/ClickHouse"
|
|
|
|
/* Global bind configuration file path */
|
|
#define GLOBAL_BIND_CONFIG "/etc/ssh/libssh_server_config"
|
|
|
|
/* Global client configuration file path */
|
|
#define GLOBAL_CLIENT_CONFIG "/etc/ssh/ssh_config"
|
|
|
|
/* Global configuration directory (libssh >= 0.12 uses it unconditionally) */
|
|
#define GLOBAL_CONF_DIR "/etc/ssh"
|
|
|
|
/* Define to 1 if we have support for ML-KEM in libgcrypt */
|
|
/* #undef HAVE_GCRYPT_MLKEM */
|
|
|
|
/* Define to 1 if we have support for ML-KEM in OpenSSL */
|
|
#define HAVE_OPENSSL_MLKEM 1
|
|
|
|
/* Define to 1 if we have support for ML-KEM1024 in either backend */
|
|
#define HAVE_MLKEM1024 1
|
|
|
|
/************************** HEADER FILES *************************/
|
|
|
|
/* Define to 1 if you have the <argp.h> header file. */
|
|
/* #undef HAVE_ARGP_H */
|
|
|
|
/* Define to 1 if you have the <aprpa/inet.h> header file. */
|
|
#define HAVE_ARPA_INET_H 1
|
|
|
|
/* Define to 1 if you have the <glob.h> header file. */
|
|
#define HAVE_GLOB_H 1
|
|
|
|
/* Define to 1 if you have the <valgrind/valgrind.h> header file. */
|
|
/* #undef HAVE_VALGRIND_VALGRIND_H */
|
|
|
|
/* Define to 1 if you have the <pty.h> header file. */
|
|
/* #undef HAVE_PTY_H */
|
|
|
|
/* Define to 1 if you have the <utmp.h> header file. */
|
|
/* #undef HAVE_UTMP_H */
|
|
|
|
/* Define to 1 if you have the <util.h> header file. */
|
|
/* #undef HAVE_UTIL_H */
|
|
|
|
/* Define to 1 if you have the <libutil.h> header file. */
|
|
/* #undef HAVE_LIBUTIL_H */
|
|
|
|
/* Define to 1 if you have the <sys/time.h> header file. */
|
|
#define HAVE_SYS_TIME_H 1
|
|
|
|
/* Define to 1 if you have the <sys/utime.h> header file. */
|
|
/* #undef HAVE_SYS_UTIME_H */
|
|
|
|
/* Define to 1 if you have the <io.h> header file. */
|
|
/* #undef HAVE_IO_H */
|
|
|
|
/* Define to 1 if you have the <termios.h> header file. */
|
|
#define HAVE_TERMIOS_H 1
|
|
|
|
/* Define to 1 if you have the <unistd.h> header file. */
|
|
#define HAVE_UNISTD_H 1
|
|
|
|
/* Define to 1 if you have the <stdint.h> header file. */
|
|
#define HAVE_STDINT_H 1
|
|
|
|
/* Define to 1 if you have the <openssl/aes.h> header file. */
|
|
#define HAVE_OPENSSL_AES_H 1
|
|
|
|
/* Define to 1 if you have the <wspiapi.h> header file. */
|
|
/* #undef HAVE_WSPIAPI_H */
|
|
|
|
/* Define to 1 if you have the <openssl/blowfish.h> header file. */
|
|
/* #undef HAVE_OPENSSL_BLOWFISH_H */
|
|
|
|
/* Define to 1 if you have the <openssl/des.h> header file. */
|
|
#define HAVE_OPENSSL_DES_H 1
|
|
|
|
/* Define to 1 if you have the <openssl/ecdh.h> header file. */
|
|
#define HAVE_OPENSSL_ECDH_H 1
|
|
|
|
/* Define to 1 if you have the <openssl/ec.h> header file. */
|
|
#define HAVE_OPENSSL_EC_H 1
|
|
|
|
/* Define to 1 if you have the <openssl/ecdsa.h> header file. */
|
|
#define HAVE_OPENSSL_ECDSA_H 1
|
|
|
|
/* Define to 1 if you have the <pthread.h> header file. */
|
|
#define HAVE_PTHREAD_H 1
|
|
|
|
/* Define to 1 if you have elliptic curve cryptography in openssl */
|
|
#define HAVE_OPENSSL_ECC 1
|
|
|
|
/* Define to 1 if you have elliptic curve cryptography in gcrypt */
|
|
/* #undef HAVE_GCRYPT_ECC */
|
|
|
|
/* Define to 1 if you have elliptic curve cryptography */
|
|
#define HAVE_ECC 1
|
|
|
|
/* Define to 1 if you have DSA */
|
|
/* #undef HAVE_DSA */
|
|
|
|
/* Define to 1 if you have gl_flags as a glob_t sturct member */
|
|
#define HAVE_GLOB_GL_FLAGS_MEMBER 1
|
|
|
|
/* Define to 1 if you have OpenSSL with Ed25519 support */
|
|
#define HAVE_OPENSSL_ED25519 1
|
|
|
|
/* Define to 1 if you have OpenSSL with X25519 support */
|
|
#define HAVE_OPENSSL_X25519 1
|
|
|
|
/*************************** FUNCTIONS ***************************/
|
|
|
|
/* Define to 1 if you have the `EVP_aes128_ctr' function. */
|
|
#define HAVE_OPENSSL_EVP_AES_CTR 1
|
|
|
|
/* Define to 1 if you have the `EVP_aes128_cbc' function. */
|
|
#define HAVE_OPENSSL_EVP_AES_CBC 1
|
|
|
|
/* Define to 1 if you have the `EVP_aes128_gcm' function. */
|
|
/* #undef HAVE_OPENSSL_EVP_AES_GCM */
|
|
|
|
/* Define to 1 if you have the `CRYPTO_THREADID_set_callback' function. */
|
|
#define HAVE_OPENSSL_CRYPTO_THREADID_SET_CALLBACK 1
|
|
|
|
/* Define to 1 if you have the `CRYPTO_ctr128_encrypt' function. */
|
|
#define HAVE_OPENSSL_CRYPTO_CTR128_ENCRYPT 1
|
|
|
|
/* Define to 1 if you have the `EVP_CIPHER_CTX_new' function. */
|
|
#define HAVE_OPENSSL_EVP_CIPHER_CTX_NEW 1
|
|
|
|
/* Define to 1 if you have the `EVP_KDF_CTX_new_id' function. */
|
|
/* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID */
|
|
|
|
/* Define to 1 if you have the `FIPS_mode' function. */
|
|
#if USE_BORINGSSL
|
|
#define HAVE_OPENSSL_FIPS_MODE 1
|
|
#endif
|
|
|
|
/* Define to 1 if you have the `EVP_DigestSign' function. */
|
|
#define HAVE_OPENSSL_EVP_DIGESTSIGN 1
|
|
|
|
/* Define to 1 if you have the `EVP_DigestVerify' function. */
|
|
#define HAVE_OPENSSL_EVP_DIGESTVERIFY 1
|
|
|
|
/* Define to 1 if you have the `OPENSSL_ia32cap_loc' function. */
|
|
/* #undef HAVE_OPENSSL_IA32CAP_LOC */
|
|
|
|
/* Define to 1 if you have the `snprintf' function. */
|
|
#define HAVE_SNPRINTF 1
|
|
|
|
/* Define to 1 if you have the `_snprintf' function. */
|
|
/* #undef HAVE__SNPRINTF */
|
|
|
|
/* Define to 1 if you have the `_snprintf_s' function. */
|
|
/* #undef HAVE__SNPRINTF_S */
|
|
|
|
/* Define to 1 if you have the `vsnprintf' function. */
|
|
#define HAVE_VSNPRINTF 1
|
|
|
|
/* Define to 1 if you have the `_vsnprintf' function. */
|
|
/* #undef HAVE__VSNPRINTF */
|
|
|
|
/* Define to 1 if you have the `_vsnprintf_s' function. */
|
|
/* #undef HAVE__VSNPRINTF_S */
|
|
|
|
/* Define to 1 if you have the `isblank' function. */
|
|
#define HAVE_ISBLANK 1
|
|
|
|
/* Define to 1 if you have the `strncpy' function. */
|
|
#define HAVE_STRNCPY 1
|
|
|
|
/* Define to 1 if you have the `strndup' function. */
|
|
#define HAVE_STRNDUP 1
|
|
|
|
/* Define to 1 if you have the `cfmakeraw' function. */
|
|
/* #undef HAVE_CFMAKERAW */
|
|
|
|
/* Define to 1 if you have the `getaddrinfo' function. */
|
|
#define HAVE_GETADDRINFO 1
|
|
|
|
/* Define to 1 if you have the `poll' function. */
|
|
#define HAVE_POLL 1
|
|
|
|
/* Define to 1 if you have the `select' function. */
|
|
#define HAVE_SELECT 1
|
|
|
|
/* Define to 1 if you have the `clock_gettime' function. */
|
|
/* #undef HAVE_CLOCK_GETTIME */
|
|
|
|
/* Define to 1 if you have the `ntohll' function. */
|
|
/* #undef HAVE_NTOHLL */
|
|
|
|
/* Define to 1 if you have the `htonll' function. */
|
|
/* #undef HAVE_HTONLL */
|
|
|
|
/* Define to 1 if you have the `strtoull' function. */
|
|
#define HAVE_STRTOULL 1
|
|
|
|
/* Define to 1 if you have the `__strtoull' function. */
|
|
/* #undef HAVE___STRTOULL */
|
|
|
|
/* Define to 1 if you have the `_strtoui64' function. */
|
|
/* #undef HAVE__STRTOUI64 */
|
|
|
|
/* Define to 1 if you have the `glob' function. */
|
|
#define HAVE_GLOB 1
|
|
|
|
/* Define to 1 if you have the `explicit_bzero' function. */
|
|
/* #undef HAVE_EXPLICIT_BZERO 1 */
|
|
|
|
/* Define to 1 if you have the `memset_s' function. */
|
|
/* #undef HAVE_MEMSET_S */
|
|
|
|
/* Define to 1 if you have the `SecureZeroMemory' function. */
|
|
/* #undef HAVE_SECURE_ZERO_MEMORY */
|
|
|
|
/* Define to 1 if you have the `cmocka_set_test_filter' function. */
|
|
/* #undef HAVE_CMOCKA_SET_TEST_FILTER */
|
|
|
|
/*************************** LIBRARIES ***************************/
|
|
|
|
/* Define to 1 if you have the `crypto' library (-lcrypto). */
|
|
#define HAVE_LIBCRYPTO 1
|
|
|
|
/* Define to 1 if you have the `gcrypt' library (-lgcrypt). */
|
|
/* #undef HAVE_LIBGCRYPT */
|
|
|
|
/* Define to 1 if you have the 'mbedTLS' library (-lmbedtls). */
|
|
/* #undef HAVE_LIBMBEDCRYPTO */
|
|
|
|
/* Define to 1 if you have the `pthread' library (-lpthread). */
|
|
#define HAVE_PTHREAD 1
|
|
|
|
/* Define to 1 if you have the `cmocka' library (-lcmocka). */
|
|
/* #undef HAVE_CMOCKA */
|
|
|
|
/**************************** OPTIONS ****************************/
|
|
|
|
#define HAVE_GCC_THREAD_LOCAL_STORAGE 1
|
|
/* #undef HAVE_MSC_THREAD_LOCAL_STORAGE */
|
|
|
|
#define HAVE_FALLTHROUGH_ATTRIBUTE 1
|
|
#define HAVE_UNUSED_ATTRIBUTE 1
|
|
|
|
#define HAVE_CONSTRUCTOR_ATTRIBUTE 1
|
|
#define HAVE_DESTRUCTOR_ATTRIBUTE 1
|
|
|
|
#define HAVE_GCC_VOLATILE_MEMORY_PROTECTION 1
|
|
|
|
#define HAVE_COMPILER__FUNC__ 1
|
|
#define HAVE_COMPILER__FUNCTION__ 1
|
|
|
|
/* #undef HAVE_GCC_BOUNDED_ATTRIBUTE */
|
|
|
|
/* Define to 1 if you want to enable GSSAPI */
|
|
/* #undef WITH_GSSAPI */
|
|
|
|
/* Define to 1 if you want to enable ZLIB */
|
|
/* #undef WITH_ZLIB */
|
|
|
|
/* Define to 1 if you want to enable SFTP */
|
|
/* #undef WITH_SFTP */
|
|
|
|
/* Define to 1 if you want to enable server support */
|
|
#define WITH_SERVER 1
|
|
|
|
/* Define to 1 if you want to enable DH group exchange algorithms */
|
|
/* #undef WITH_GEX */
|
|
|
|
/* Define to 1 if you want to enable blowfish cipher support */
|
|
/* #undef WITH_BLOWFISH_CIPHER */
|
|
|
|
/* Define to 1 if you want to enable debug output for crypto functions */
|
|
/* #undef DEBUG_CRYPTO */
|
|
|
|
/* Define to 1 if you want to enable debug output for packet functions */
|
|
/* #undef DEBUG_PACKET */
|
|
|
|
/* Define to 1 if you want to enable pcap output support (experimental) */
|
|
/* #undef WITH_PCAP */
|
|
|
|
/* Define to 1 if you want to enable calltrace debug output */
|
|
/* #undef DEBUG_CALLTRACE */
|
|
|
|
/* Define to 1 if you want to enable NaCl support */
|
|
/* #undef WITH_NACL */
|
|
|
|
/*************************** ENDIAN *****************************/
|
|
|
|
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
|
|
significant byte first (like Motorola and SPARC, unlike Intel). */
|
|
#define WORDS_BIGENDIAN 1
|