From 6e097a619b3f6a40a73f6985b9406fb27cda747a Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Fri, 24 Feb 2017 15:32:28 +0100 Subject: [PATCH] Check if we are using LibreSSL instead of OpenSSL --- CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fde31e3b..23fc3b80f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,7 +81,7 @@ IF(WITH_SIGNCODE) MARK_AS_ADVANCED(SIGN_OPTIONS) ENDIF() -SET(MARIADB_CONNECTOR_C_COPYRIGHT "2013-2016 MariaDB Corporation Ab") +SET(MARIADB_CONNECTOR_C_COPYRIGHT "2013-2017 MariaDB Corporation Ab") IF(WITH_RTC) SET(RTC_OPTIONS "/RTC1 /RTCc") @@ -260,7 +260,13 @@ IF(NOT WITH_SSL STREQUAL "OFF") SET(SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY}) INCLUDE_DIRECTORIES(BEFORE ${OPENSSL_INCLUDE_DIR}) MESSAGE1(OPENSSL_VERSION "OpenSSL version: ${OPENSSL_VERSION}") - SET(TLS_LIBRARY_VERSION "OpenSSL ${OPENSSL_VERSION}") + + CHECK_SYMBOL_EXISTS(LIBRESSL_VERSION_NUMBER "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" HAVE_LIBRESSL) + IF(HAVE_LIBRESSL) + SET(TLS_LIBRARY_VERSION "LibreSSL ${OPENSSL_VERSION}") + ELSE() + SET(TLS_LIBRARY_VERSION "OpenSSL ${OPENSSL_VERSION}") + ENDIF() ELSE() MESSAGE1(OPENSSL_VERSION "OpenSSL not found") ENDIF()