Mercurial > hg > orthanc
diff OrthancFramework/Resources/CMake/OpenSslConfigurationStatic-3.0.cmake @ 4861:d1aae7c3dd5d openssl-3.x
upgraded openssl to 3.0.1
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 24 Dec 2021 17:12:49 +0100 |
| parents | 2b3db9d08fe2 |
| children | 0a5d05637701 |
line wrap: on
line diff
--- a/OrthancFramework/Resources/CMake/OpenSslConfigurationStatic-3.0.cmake Fri Dec 24 16:52:51 2021 +0100 +++ b/OrthancFramework/Resources/CMake/OpenSslConfigurationStatic-3.0.cmake Fri Dec 24 17:12:49 2021 +0100 @@ -20,12 +20,12 @@ set(OPENSSL_VERSION_MAJOR 3) set(OPENSSL_VERSION_MINOR 0) -set(OPENSSL_VERSION_PATCH 0) -set(OPENSSL_VERSION_PRE_RELEASE "-beta1") +set(OPENSSL_VERSION_PATCH 1) +set(OPENSSL_VERSION_PRE_RELEASE "") set(OPENSSL_VERSION_FULL "${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_PATCH}${OPENSSL_VERSION_PRE_RELEASE}") SET(OPENSSL_SOURCES_DIR ${CMAKE_BINARY_DIR}/openssl-${OPENSSL_VERSION_FULL}) SET(OPENSSL_URL "http://orthanc.osimis.io/ThirdPartyDownloads/openssl-${OPENSSL_VERSION_FULL}.tar.gz") -SET(OPENSSL_MD5 "437b21bd0e09fbaa0a89151c6c0130a7") +SET(OPENSSL_MD5 "7d07e849d77d276891edd579a8832bb3") if (IS_DIRECTORY "${OPENSSL_SOURCES_DIR}") set(FirstRun OFF) @@ -40,7 +40,7 @@ # Apply the patches execute_process( COMMAND ${PATCH_EXECUTABLE} -p0 -N -i - ${CMAKE_CURRENT_LIST_DIR}/../Patches/openssl-3.0.0-beta1.patch + ${CMAKE_CURRENT_LIST_DIR}/../Patches/openssl-${OPENSSL_VERSION_FULL}.patch WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE Failure ) @@ -81,7 +81,7 @@ set(VERSION_VERSION_OFFSET 15) endif() -math(EXPR OPENSSL_CONFIGURED_API "${OPENSSL_VERSION_MAJOR} * 10000 + ${OPENSSL_VERSION_MINOR} * 100 + ${OPENSSL_VERSION_PATCH}") +math(EXPR OPENSSL_CONFIGURED_API "${OPENSSL_VERSION_MAJOR} * 10000 + ${OPENSSL_VERSION_MINOR} * 100") # This macro is normally defined in "opensslv.h.in" math(EXPR OPENSSL_VERSION_NUMBER "(${OPENSSL_VERSION_MAJOR} << 28) + (${OPENSSL_VERSION_MINOR} << 20) + (${OPENSSL_VERSION_PATCH} << 4) + ${VERSION_VERSION_OFFSET}")