From 41683c1b7ccf5b1b40d324470b5ea0eccfa26ba3 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sun, 11 Sep 2016 16:36:23 +0200 Subject: [PATCH] Cmake: Limit OpenSSL version to 1.0.x client needs RC4 and 1.1.x removes the support --- cmake/macros/FindOpenSSL.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake/macros/FindOpenSSL.cmake b/cmake/macros/FindOpenSSL.cmake index 7baa43274ab..ff9095dc4b0 100644 --- a/cmake/macros/FindOpenSSL.cmake +++ b/cmake/macros/FindOpenSSL.cmake @@ -25,6 +25,9 @@ # http://www.slproweb.com/products/Win32OpenSSL.html +set(OPENSSL_EXPECTED_VERSION "1.0") +set(OPENSSL_MAX_VERSION "1.1") + SET(_OPENSSL_ROOT_HINTS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]" @@ -218,9 +221,9 @@ if (OPENSSL_INCLUDE_DIR) endif (_OPENSSL_VERSION) include(EnsureVersion) - ENSURE_VERSION( "${OPENSSL_EXPECTED_VERSION}" "${OPENSSL_VERSION}" OPENSSL_VERSION_OK) + ENSURE_VERSION_RANGE("${OPENSSL_EXPECTED_VERSION}" "${OPENSSL_VERSION}" "${OPENSSL_MAX_VERSION}" OPENSSL_VERSION_OK) if (NOT OPENSSL_VERSION_OK) - message(FATAL_ERROR "TrinityCore needs OpenSSL version ${OPENSSL_EXPECTED_VERSION} but found version ${OPENSSL_VERSION}") + message(FATAL_ERROR "TrinityCore needs OpenSSL version ${OPENSSL_EXPECTED_VERSION} but found too new version ${OPENSSL_VERSION}. Any version different to 1.0.x breaks TrinityCore compatibility (and we cannot fix this). Please install OpenSSL 1.0.x") endif() endif (OPENSSL_INCLUDE_DIR)