# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1641394552 -3600
# Node ID e1944053cbef1e4b9f7cd81b14daaae10934546a
# Parent  36587ae9e0e1280a51e6ba450d9b98b7e7b13aa0# Parent  82612f07226af5b93b86673495af18ad391617c4
merge

diff -r 36587ae9e0e1 -r e1944053cbef OrthancFramework/Resources/CMake/OpenSslConfigurationStatic-3.0.cmake
--- a/OrthancFramework/Resources/CMake/OpenSslConfigurationStatic-3.0.cmake	Wed Jan 05 15:55:42 2022 +0100
+++ b/OrthancFramework/Resources/CMake/OpenSslConfigurationStatic-3.0.cmake	Wed Jan 05 15:55:52 2022 +0100
@@ -111,6 +111,7 @@
   
   -DOPENSSL_NO_AFALGENG
   -DOPENSSL_NO_ASM
+  -DOPENSSL_NO_CHACHA  # Necessary for VC2015-64 since openssl-3.0.1
   -DOPENSSL_NO_DEVCRYPTOENG
   -DOPENSSL_NO_DYNAMIC_ENGINE
   -DOPENSSL_NO_EC_NISTP_64_GCC_128
diff -r 36587ae9e0e1 -r e1944053cbef OrthancServer/UnitTestsSources/VersionsTests.cpp
--- a/OrthancServer/UnitTestsSources/VersionsTests.cpp	Wed Jan 05 15:55:42 2022 +0100
+++ b/OrthancServer/UnitTestsSources/VersionsTests.cpp	Wed Jan 05 15:55:52 2022 +0100
@@ -166,7 +166,11 @@
 #if ORTHANC_ENABLE_SSL == 1
 TEST(Version, OpenSslStatic)
 {
-  ASSERT_EQ(0x3000100fL /* openssl-3.0.1 */, OPENSSL_VERSION_NUMBER);
+  // openssl-3.0.1
+  ASSERT_EQ(3 * 0x10000000L +
+            0 * 0x00100000L +
+            1 * 0x00000010L +
+            0 * 0x0000000fL, OPENSSL_VERSION_NUMBER);
 }
 #endif