Skip to content

Commit

Permalink
STRY52599994: porting 10.2.27 static ssl change to 10.4 (#35)
Browse files Browse the repository at this point in the history
  • Loading branch information
thejaka-kanewala authored and midenok committed May 4, 2023
1 parent d01bb47 commit 0684ef5
Showing 1 changed file with 31 additions and 1 deletion.
32 changes: 31 additions & 1 deletion cmake/ssl.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,37 @@ MACRO (MYSQL_CHECK_SSL)
SET(WITH_SSL_PATH ${WITH_SSL} CACHE PATH "path to custom SSL installation")
ENDIF()

IF(WITH_SSL STREQUAL "bundled")
IF(WITH_SSL STREQUAL "static11")
IF(!CMAKE_SYSTEM_NAME MATCHES "Linux")
MESSAGE(FATAL_ERROR "WITH_SSL=static11 can only be used on CentOS 7 with static openssl 1.1.1 libraries installed")
ENDIF()
SET(OPENSSL_FOUND "TRUE")
SET(OPENSSL_INCLUDE_DIR "/usr/include/openssl11")
SET(OPENSSL_LIBRARIES "/usr/lib64/openssl11/libssl.a;/usr/lib64/openssl11/libcrypto.a")
SET(OPENSSL_VERSION "1.1.1g")
SET(OPENSSL_SSL_LIBRARY "/usr/lib64/openssl11/libssl.a")
SET(OPENSSL_CRYPTO_LIBRARY "/usr/lib64/openssl11/libcrypto.a")
SET(OPENSSL_LIBRARY ${OPENSSL_SSL_LIBRARY})
SET(SSL_SOURCES "")
SET(SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} -lpthread)

MESSAGE_ONCE(OPENSSL_INCLUDE_DIR "OPENSSL_INCLUDE_DIR = ${OPENSSL_INCLUDE_DIR}")
MESSAGE_ONCE(OPENSSL_SSL_LIBRARY "OPENSSL_SSL_LIBRARY = ${OPENSSL_SSL_LIBRARY}")
MESSAGE_ONCE(OPENSSL_CRYPTO_LIBRARY "OPENSSL_CRYPTO_LIBRARY = ${OPENSSL_CRYPTO_LIBRARY}")
MESSAGE_ONCE(OPENSSL_VERSION "OPENSSL_VERSION = ${OPENSSL_VERSION}")
MESSAGE_ONCE(SSL_LIBRARIES "SSL_LIBRARIES = ${SSL_LIBRARIES}")

SET(SSL_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR})
SET(SSL_INTERNAL_INCLUDE_DIRS "")
SET(SSL_DEFINES "-DHAVE_OPENSSL")

SET(CMAKE_REQUIRED_LIBRARIES ${SSL_LIBRARIES})
SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
SET(HAVE_ERR_remove_thread_state OFF CACHE INTERNAL "")
SET(HAVE_EncryptAes128Ctr ON CACHE INTERNAL "")
SET(HAVE_EncryptAes128Gcm ON CACHE INTERNAL "")

ELSEIF(WITH_SSL STREQUAL "bundled")
MYSQL_USE_BUNDLED_SSL()
# Reset some variables, in case we switch from /path/to/ssl to "bundled".
IF (WITH_SSL_PATH)
Expand Down

0 comments on commit 0684ef5

Please sign in to comment.