Mercurial > hg > orthanc

changeset 4869:e1944053cbef openssl-3.x

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 05 Jan 2022 15:55:52 +0100
parents 36587ae9e0e1 (current diff) 82612f07226a (diff)
children 6eff25f70121
files OrthancFramework/Resources/CMake/OpenSslConfigurationStatic-3.0.cmake
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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