1
0
Fork 0

Enable OpenSSL strict version to separate ArangoDB and build it in os… (#10326)

* Enable OpenSSL strict version to separate ArangoDB and build it in oskar (Windows)

* Retain with older requirements
This commit is contained in:
KVS85 2019-10-29 08:42:47 +03:00 committed by GitHub
parent 57a2982976
commit 3e45b1aced
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 454 additions and 20 deletions

View File

@ -258,11 +258,6 @@ message(STATUS "SNAP REVISION: ${ARANGODB_SNAP_REVISION}")
# ------------------------------------------------------------------------------
if (WIN32)
# path containing the OpenSSL find-module and libraries
set(WIN_FIND_OPENSSL_PATH "C:/OpenSSL-ArangoDB")
if (EXISTS "${WIN_FIND_OPENSSL_PATH}")
list(APPEND CMAKE_MODULE_PATH ${WIN_FIND_OPENSSL_PATH})
endif()
project(arangodb3 LANGUAGES CXX C VERSION ${ARANGODB_VERSION_MAJOR}.${ARANGODB_VERSION_MINOR})
else ()
project(arangodb3 LANGUAGES CXX C ASM VERSION ${ARANGODB_VERSION_MAJOR}.${ARANGODB_VERSION_MINOR})
@ -974,22 +969,82 @@ endif()
################################################################################
## OPENSSL
## OpenSSL
################################################################################
# Some special stuff for Mac OSX and homebrew as a preparation for the
# generic FindOpenSSL script:
if (APPLE AND BREW AND NOT OPENSSL_ROOT_DIR)
message("searching openssl with brew (${BREW})")
# if we have a brew openssl, prefer it over the elderly system one.
execute_process(OUTPUT_VARIABLE BREW_ROOT
OUTPUT_STRIP_TRAILING_WHITESPACE
COMMAND ${BREW} --prefix)
set(OPENSSL_ROOT_DIR "${BREW_ROOT}/opt/openssl")
message("auto-set OPENSSL_ROOT_DIR to: ${OPENSSL_ROOT_DIR}")
if (NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/VERSIONS")
message(FATAL_ERROR "expecting ${CMAKE_CURRENT_LIST_DIR}/VERSIONS")
else ()
file(READ "${CMAKE_CURRENT_LIST_DIR}/VERSIONS" ARANGODB_VERSIONS_CONTENT)
if (LINUX)
set (TARGET_OS "LINUX")
elseif (DARWIN)
set (TARGET_OS "MACOS")
elseif (WIN32)
set (TARGET_OS "WINDOWS")
endif ()
if (USE_STRICT_OPENSSL_VERSION)
set (OPENSSL_VERSION_PATTERN ".*OPENSSL_${TARGET_OS}[ ]+\"([^\"]*).*")
else ()
set (OPENSSL_VERSION_PATTERN ".*OPENSSL_${TARGET_OS}[ ]+\"([^\"a-z]*).*")
endif ()
string(REGEX MATCH
"${OPENSSL_VERSION_PATTERN}"
ARANGODB_REQUIRED_OPENSSL_VERSION
"${ARANGODB_VERSIONS_CONTENT}")
if ("${CMAKE_MATCH_1}" STREQUAL "")
message(FATAL_ERROR "expecting OPENSSL_${TARGET_OS} in ${CMAKE_CURRENT_LIST_DIR}/VERSIONS")
else ()
set (ARANGODB_REQUIRED_OPENSSL_VERSION "${CMAKE_MATCH_1}")
if (USE_STRICT_OPENSSL_VERSION)
set (MSG_ARANGODB_REQUIRED_OPENSSL_VERSION "${ARANGODB_REQUIRED_OPENSSL_VERSION}")
else ()
set (MSG_ARANGODB_REQUIRED_OPENSSL_VERSION "${ARANGODB_REQUIRED_OPENSSL_VERSION}*")
endif ()
message ("Required OpenSSL version: ${MSG_ARANGODB_REQUIRED_OPENSSL_VERSION}")
endif ()
endif ()
if (NOT DEFINED OPENSSL_ROOT_DIR OR "${OPENSSL_ROOT_DIR}" STREQUAL "")
if (DEFINED ENV{OPENSSL_ROOT_DIR} AND NOT "$ENV{OPENSSL_ROOT_DIR}" STREQUAL "")
set (OPENSSL_ROOT_DIR "$ENV{OPENSSL_ROOT_DIR}")
endif ()
else ()
set(ENV{OPENSSL_ROOT_DIR} "${OPENSSL_ROOT_DIR}")
endif ()
unset (OPENSSL_FOUND CACHE)
unset (OPENSSL_INCLUDE_DIR CACHE)
unset (OPENSSL_CRYPTO_LIBRARY CACHE)
unset (OPENSSL_SSL_LIBRARY CACHE)
unset (OPENSSL_LIBRARIES CACHE)
unset (OPENSSL_VERSION CACHE)
if (DEFINED OPENSSL_ROOT_DIR AND NOT "${OPENSSL_ROOT_DIR}" STREQUAL "")
message ("Use OPENSSL_ROOT_DIR: ${OPENSSL_ROOT_DIR}")
endif ()
if (WIN32)
# Attempt to find ArangoDB CI compiled OpenSSL
message ("Attempt to find ArangoDB CI compiled OpenSSL:")
include ("${CMAKE_CURRENT_LIST_DIR}/cmake/custom/ArangoDB_FindOpenSSL_WIN32.cmake")
if (NOT OPENSSL_FOUND)
message ("System-wide attempt to find OpenSSL:")
find_package(OpenSSL REQUIRED)
endif ()
else ()
find_package(OpenSSL REQUIRED)
endif ()
if (OPENSSL_FOUND)
if (NOT "${OPENSSL_VERSION}" MATCHES "${ARANGODB_REQUIRED_OPENSSL_VERSION}")
message (FATAL_ERROR "Wrong OpenSSL version was found: ${OPENSSL_VERSION}! Required version: ${MSG_ARANGODB_REQUIRED_OPENSSL_VERSION}!")
endif ()
endif ()
message(${OPENSSL_INCLUDE_DIR})
include_directories(${OPENSSL_INCLUDE_DIR})
add_definitions(-DARANGODB_OPENSSL_VERSION=\"${OPENSSL_VERSION}\")

View File

@ -3,9 +3,9 @@ SYNCER_REV "0.6.5"
GCC_LINUX "8.3.0"
MSVC_WINDOWS "2017"
MACOS_MIN "10.11"
OPENSSL_LINUX "1.1.1"
OPENSSL_MACOS "1.1.1"
OPENSSL_WINDOWS "1.1.1"
OPENSSL_LINUX "1.1.1d"
OPENSSL_MACOS "1.1.1d"
OPENSSL_WINDOWS "1.1.1d"
USE_RCLONE "true"
GSEARCH_ID_HTTP "010085642145132923492:fixi4yzeiz8"
GSEARCH_ID_AQL "010085642145132923492:6ymjhhr677k"

View File

@ -0,0 +1,379 @@
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details.
#.rst:
# FindOpenSSL
# -----------
#
# Find the OpenSSL encryption library.
#
# Imported Targets
# ^^^^^^^^^^^^^^^^
#
# This module defines the following :prop_tgt:`IMPORTED` targets:
#
# ``OpenSSL::SSL``
# The OpenSSL ``ssl`` library, if found.
# ``OpenSSL::Crypto``
# The OpenSSL ``crypto`` library, if found.
#
# Result Variables
# ^^^^^^^^^^^^^^^^
#
# This module will set the following variables in your project:
#
# ``OPENSSL_FOUND``
# System has the OpenSSL library.
# ``OPENSSL_INCLUDE_DIR``
# The OpenSSL include directory.
# ``OPENSSL_CRYPTO_LIBRARY``
# The OpenSSL crypto library.
# ``OPENSSL_SSL_LIBRARY``
# The OpenSSL SSL library.
# ``OPENSSL_LIBRARIES``
# All OpenSSL libraries.
# ``OPENSSL_VERSION``
# This is set to ``$major.$minor.$revision$patch`` (e.g. ``0.9.8s``).
#
if (UNIX)
message(FATAL_ERROR "FindOpenssl not implemented on UNIX")
endif ()
## get path parts determined by configuration
if(OPENSSL_USE_STATIC_LIBS)
set(BUILD_TYPE "static")
else()
set(BUILD_TYPE "shared")
endif(OPENSSL_USE_STATIC_LIBS)
# visual studio version
if (${CMAKE_GENERATOR} MATCHES "2017")
set(VS_VERSION "2017")
elseif (${CMAKE_GENERATOR} MATCHES "2019")
set(VS_VERSION "2019")
else()
message(FATAL_ERROR "Generator not supported")
endif()
#store original suffixes
set(_openssl_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
## find includes
set(ssl_base_path "${OPENSSL_ROOT_DIR}")
set(BUILD_MODE "release")
set(path_part "VS_${VS_VERSION}/${BUILD_TYPE}-${BUILD_MODE}")
set(ssl_search_path "${ssl_base_path}/${path_part}/")
set(CMAKE_FIND_LIBRARY_SUFFIXES .lib ${CMAKE_FIND_LIBRARY_SUFFIXES} )
find_path(OPENSSL_INCLUDE_DIR
NAMES "openssl/ssl.h"
PATHS ${ssl_search_path}
PATH_SUFFIXES "include"
NO_DEFAULT_PATH
)
## find libs
set(_OPENSSL_PATH_SUFFIXES "bin" "lib")
# release
find_library(LIB_EAY_RELEASE
NAMES
libcrypto
libeay32
crypto
NAMES_PER_DIR
PATHS ${ssl_search_path}
PATH_SUFFIXES
${_OPENSSL_PATH_SUFFIXES}
NO_DEFAULT_PATH
)
find_library(SSL_EAY_RELEASE
NAMES
libssl
ssl
NAMES_PER_DIR
PATHS ${ssl_search_path}
PATH_SUFFIXES
${_OPENSSL_PATH_SUFFIXES}
NO_DEFAULT_PATH
)
if(NOT OPENSSL_USE_STATIC_LIBS)
set(CMAKE_FIND_LIBRARY_SUFFIXES_STORED ${CMAKE_FIND_LIBRARY_SUFFIXES} )
set(CMAKE_FIND_LIBRARY_SUFFIXES .dll ${CMAKE_FIND_LIBRARY_SUFFIXES} )
#libcrypto-1_1-x64.dll
find_library(LIB_EAY_RELEASE_DLL
NAMES
libcrypto-1_1-x64
libcrypto
crypto
NAMES_PER_DIR
PATHS ${ssl_search_path}
PATH_SUFFIXES
${_OPENSSL_PATH_SUFFIXES}
NO_DEFAULT_PATH
)
#libssl-1_1-x64.dll
find_library(SSL_EAY_RELEASE_DLL
NAMES
libssl-1_1-x64
libssl
ssl
NAMES_PER_DIR
PATHS ${ssl_search_path}
PATH_SUFFIXES
${_OPENSSL_PATH_SUFFIXES}
NO_DEFAULT_PATH
)
# THIS WILL COLLIDE WITH DEBUG
install (FILES "${LIB_EAY_RELEASE_DLL}" DESTINATION "${CMAKE_INSTALL_BINDIR}/" COMPONENT Libraries)
install (FILES "${SSL_EAY_RELEASE_DLL}" DESTINATION "${CMAKE_INSTALL_BINDIR}/" COMPONENT Libraries)
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_STORED} )
endif()
# update search path
set(BUILD_MODE "debug")
set(path_part "${VS_VERSION}/${BUILD_TYPE}-${BUILD_MODE}")
set(ssl_search_path "${ssl_base_path}/${path_part}/")
find_library(LIB_EAY_DEBUG
NAMES
libcrypto
libeay32
crypto
NAMES_PER_DIR
PATHS ${ssl_search_path}
PATH_SUFFIXES
${_OPENSSL_PATH_SUFFIXES}
NO_DEFAULT_PATH
)
find_library(SSL_EAY_DEBUG
NAMES
libssl
ssl
NAMES_PER_DIR
PATHS ${ssl_search_path}
PATH_SUFFIXES
${_OPENSSL_PATH_SUFFIXES}
NO_DEFAULT_PATH
)
if(NOT OPENSSL_USE_STATIC_LIBS)
set(CMAKE_FIND_LIBRARY_SUFFIXES_STORED ${CMAKE_FIND_LIBRARY_SUFFIXES} )
set(CMAKE_FIND_LIBRARY_SUFFIXES .dll ${CMAKE_FIND_LIBRARY_SUFFIXES} )
#libcrypto-1_1-x64.dll
find_library(LIB_EAY_DEBUG_DLL
NAMES
libcrypto-1_1-x64
libcrypto
crypto
NAMES_PER_DIR
PATHS ${ssl_search_path}
PATH_SUFFIXES
${_OPENSSL_PATH_SUFFIXES}
NO_DEFAULT_PATH
)
#libssl-1_1-x64.dll
find_library(SSL_EAY_DEBUG_DLL
NAMES
libssl-1_1-x64
libssl
ssl
NAMES_PER_DIR
PATHS ${ssl_search_path}
PATH_SUFFIXES
${_OPENSSL_PATH_SUFFIXES}
NO_DEFAULT_PATH
)
# THIS WILL COLLIDE WITH RELEASE
install (FILES "${LIB_EAY_DEBUG_DLL}" DESTINATION "${CMAKE_INSTALL_BINDIR}/" COMPONENT Libraries)
install (FILES "${SSL_EAY_DEBUG_DLL}" DESTINATION "${CMAKE_INSTALL_BINDIR}/" COMPONENT Libraries)
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_STORED})
endif()
set(LIB_EAY_LIBRARY_DEBUG "${LIB_EAY_DEBUG}")
set(LIB_EAY_LIBRARY_RELEASE "${LIB_EAY_RELEASE}")
set(SSL_EAY_LIBRARY_DEBUG "${SSL_EAY_DEBUG}")
set(SSL_EAY_LIBRARY_RELEASE "${SSL_EAY_RELEASE}")
include(SelectLibraryConfigurations)
select_library_configurations(LIB_EAY)
select_library_configurations(SSL_EAY)
mark_as_advanced(LIB_EAY_LIBRARY_DEBUG LIB_EAY_LIBRARY_RELEASE
SSL_EAY_LIBRARY_DEBUG SSL_EAY_LIBRARY_RELEASE)
set(OPENSSL_SSL_LIBRARY ${SSL_EAY_LIBRARY} )
set(OPENSSL_CRYPTO_LIBRARY ${LIB_EAY_LIBRARY} )
function(from_hex HEX DEC)
string(TOUPPER "${HEX}" HEX)
set(_res 0)
string(LENGTH "${HEX}" _strlen)
while (_strlen GREATER 0)
math(EXPR _res "${_res} * 16")
string(SUBSTRING "${HEX}" 0 1 NIBBLE)
string(SUBSTRING "${HEX}" 1 -1 HEX)
if (NIBBLE STREQUAL "A")
math(EXPR _res "${_res} + 10")
elseif (NIBBLE STREQUAL "B")
math(EXPR _res "${_res} + 11")
elseif (NIBBLE STREQUAL "C")
math(EXPR _res "${_res} + 12")
elseif (NIBBLE STREQUAL "D")
math(EXPR _res "${_res} + 13")
elseif (NIBBLE STREQUAL "E")
math(EXPR _res "${_res} + 14")
elseif (NIBBLE STREQUAL "F")
math(EXPR _res "${_res} + 15")
else()
math(EXPR _res "${_res} + ${NIBBLE}")
endif()
string(LENGTH "${HEX}" _strlen)
endwhile()
set(${DEC} ${_res} PARENT_SCOPE)
endfunction()
if(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
if(openssl_version_str)
# The version number is encoded as 0xMNNFFPPS: major minor fix patch status
# The status gives if this is a developer or prerelease and is ignored here.
# Major, minor, and fix directly translate into the version numbers shown in
# the string. The patch field translates to the single character suffix that
# indicates the bug fix state, which 00 -> nothing, 01 -> a, 02 -> b and so
# on.
string(REGEX REPLACE "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F]).*$"
"\\1;\\2;\\3;\\4;\\5" OPENSSL_VERSION_LIST "${openssl_version_str}")
list(GET OPENSSL_VERSION_LIST 0 OPENSSL_VERSION_MAJOR)
list(GET OPENSSL_VERSION_LIST 1 OPENSSL_VERSION_MINOR)
from_hex("${OPENSSL_VERSION_MINOR}" OPENSSL_VERSION_MINOR)
list(GET OPENSSL_VERSION_LIST 2 OPENSSL_VERSION_FIX)
from_hex("${OPENSSL_VERSION_FIX}" OPENSSL_VERSION_FIX)
list(GET OPENSSL_VERSION_LIST 3 OPENSSL_VERSION_PATCH)
if (NOT OPENSSL_VERSION_PATCH STREQUAL "00")
from_hex("${OPENSSL_VERSION_PATCH}" _tmp)
# 96 is the ASCII code of 'a' minus 1
math(EXPR OPENSSL_VERSION_PATCH_ASCII "${_tmp} + 96")
unset(_tmp)
# Once anyone knows how OpenSSL would call the patch versions beyond 'z'
# this should be updated to handle that, too. This has not happened yet
# so it is simply ignored here for now.
string(ASCII "${OPENSSL_VERSION_PATCH_ASCII}" OPENSSL_VERSION_PATCH_STRING)
endif ()
set(OPENSSL_VERSION "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH_STRING}")
endif ()
endif ()
include(FindPackageHandleStandardArgs)
set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} )
if (OPENSSL_VERSION)
find_package_handle_standard_args(OpenSSL
REQUIRED_VARS
#OPENSSL_SSL_LIBRARY # FIXME: require based on a component request?
OPENSSL_CRYPTO_LIBRARY
OPENSSL_INCLUDE_DIR
VERSION_VAR
OPENSSL_VERSION
FAIL_MESSAGE
"Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR"
)
else ()
find_package_handle_standard_args(OpenSSL "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR"
#OPENSSL_SSL_LIBRARY # FIXME: require based on a component request?
OPENSSL_CRYPTO_LIBRARY
OPENSSL_INCLUDE_DIR
)
endif ()
mark_as_advanced(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES)
if(OPENSSL_FOUND)
if(NOT TARGET OpenSSL::Crypto AND
(EXISTS "${OPENSSL_CRYPTO_LIBRARY}" OR
EXISTS "${LIB_EAY_LIBRARY_DEBUG}" OR
EXISTS "${LIB_EAY_LIBRARY_RELEASE}")
)
add_library(OpenSSL::Crypto UNKNOWN IMPORTED)
set_target_properties(OpenSSL::Crypto PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}")
if(EXISTS "${OPENSSL_CRYPTO_LIBRARY}")
set_target_properties(OpenSSL::Crypto PROPERTIES
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
IMPORTED_LOCATION "${OPENSSL_CRYPTO_LIBRARY}")
endif()
if(EXISTS "${LIB_EAY_LIBRARY_RELEASE}")
set_property(TARGET OpenSSL::Crypto APPEND PROPERTY
IMPORTED_CONFIGURATIONS RELEASE)
set_target_properties(OpenSSL::Crypto PROPERTIES
IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
IMPORTED_LOCATION_RELEASE "${LIB_EAY_LIBRARY_RELEASE}")
endif()
if(EXISTS "${LIB_EAY_LIBRARY_DEBUG}")
set_property(TARGET OpenSSL::Crypto APPEND PROPERTY
IMPORTED_CONFIGURATIONS DEBUG)
set_target_properties(OpenSSL::Crypto PROPERTIES
IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
IMPORTED_LOCATION_DEBUG "${LIB_EAY_LIBRARY_DEBUG}")
endif()
endif()
if(NOT TARGET OpenSSL::SSL AND
(EXISTS "${OPENSSL_SSL_LIBRARY}" OR
EXISTS "${SSL_EAY_LIBRARY_DEBUG}" OR
EXISTS "${SSL_EAY_LIBRARY_RELEASE}")
)
add_library(OpenSSL::SSL UNKNOWN IMPORTED)
set_target_properties(OpenSSL::SSL PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}")
if(EXISTS "${OPENSSL_SSL_LIBRARY}")
set_target_properties(OpenSSL::SSL PROPERTIES
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
IMPORTED_LOCATION "${OPENSSL_SSL_LIBRARY}")
endif()
if(EXISTS "${SSL_EAY_LIBRARY_RELEASE}")
set_property(TARGET OpenSSL::SSL APPEND PROPERTY
IMPORTED_CONFIGURATIONS RELEASE)
set_target_properties(OpenSSL::SSL PROPERTIES
IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
IMPORTED_LOCATION_RELEASE "${SSL_EAY_LIBRARY_RELEASE}")
endif()
if(EXISTS "${SSL_EAY_LIBRARY_DEBUG}")
set_property(TARGET OpenSSL::SSL APPEND PROPERTY
IMPORTED_CONFIGURATIONS DEBUG)
set_target_properties(OpenSSL::SSL PROPERTIES
IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "C"
IMPORTED_LOCATION_DEBUG "${SSL_EAY_LIBRARY_DEBUG}")
endif()
if(TARGET OpenSSL::Crypto)
set_target_properties(OpenSSL::SSL PROPERTIES
INTERFACE_LINK_LIBRARIES OpenSSL::Crypto)
endif()
endif()
endif()
# Restore the original find library ordering
if(OPENSSL_USE_STATIC_LIBS)
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_openssl_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
endif()