Mercurial > hg > orthanc

changeset 5068:02fae039a15d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade to openssl 3.0.5
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 15 Aug 2022 15:44:40 +0200
parents 6ad2bea0e07e
children c22b4447ff73
files NEWS OrthancFramework/Resources/CMake/OpenSslConfigurationStatic-3.0.cmake OrthancFramework/Resources/Patches/openssl-3.0.1.patch OrthancFramework/Resources/Patches/openssl-3.0.5.patch OrthancServer/UnitTestsSources/VersionsTests.cpp
diffstat 5 files changed, 58 insertions(+), 57 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Mon Aug 15 15:34:02 2022 +0200
+++ b/NEWS	Mon Aug 15 15:44:40 2022 +0200
@@ -26,6 +26,7 @@
 * Upgraded dependencies for static builds:
   - boost 1.80.0
   - dcmtk 3.6.7
+  - openssl 3.0.5
 
 
 Version 1.11.1 (2022-06-30)
--- a/OrthancFramework/Resources/CMake/OpenSslConfigurationStatic-3.0.cmake	Mon Aug 15 15:34:02 2022 +0200
+++ b/OrthancFramework/Resources/CMake/OpenSslConfigurationStatic-3.0.cmake	Mon Aug 15 15:44:40 2022 +0200
@@ -21,12 +21,12 @@
 
 set(OPENSSL_VERSION_MAJOR 3)
 set(OPENSSL_VERSION_MINOR 0)
-set(OPENSSL_VERSION_PATCH 1)
+set(OPENSSL_VERSION_PATCH 5)
 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 "7d07e849d77d276891edd579a8832bb3")
+SET(OPENSSL_MD5 "163bb3e58c143793d1dc6a6ec7d185d5")
 
 if (IS_DIRECTORY "${OPENSSL_SOURCES_DIR}")
   set(FirstRun OFF)
--- a/OrthancFramework/Resources/Patches/openssl-3.0.1.patch	Mon Aug 15 15:34:02 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-diff -urEb openssl-3.0.1.orig/crypto/threads_win.c openssl-3.0.1/crypto/threads_win.c
---- openssl-3.0.1.orig/crypto/threads_win.c	2021-12-24 16:56:23.016304241 +0100
-+++ openssl-3.0.1/crypto/threads_win.c	2021-12-24 16:58:09.436272646 +0100
-@@ -207,13 +207,30 @@
- int CRYPTO_atomic_or(uint64_t *val, uint64_t op, uint64_t *ret,
-                      CRYPTO_RWLOCK *lock)
- {
-+#if defined(_WIN32) && !defined(_WIN64)
-+    /**
-+     * Prevents the following error, at least on Visual Studio 2008,
-+     * but most probably on any Window 32bit system:
-+     * "CoreLibrary.lib(threads_win.obj) : error LNK2019: unresolved
-+     * external symbol _InterlockedOr64 referenced in function
-+     * _CRYPTO_atomic_or". TODO - The lock should be locked!
-+     * https://developercommunity.visualstudio.com/t/-interlockedexchangeadd64-is-unresolved-on-x86/1227636
-+     **/
-+    *ret = (*val) | op;
-+#else
-     *ret = (uint64_t)InterlockedOr64((LONG64 volatile *)val, (LONG64)op) | op;
-+#endif
-     return 1;
- }
- 
- int CRYPTO_atomic_load(uint64_t *val, uint64_t *ret, CRYPTO_RWLOCK *lock)
- {
-+#if defined(_WIN32) && !defined(_WIN64)
-+    /* See comment above */
-+    *ret = *val;
-+#else
-     *ret = (uint64_t)InterlockedOr64((LONG64 volatile *)val, 0);
-+#endif
-     return 1;
- }
- 
-diff -urEb openssl-3.0.1.orig/providers/implementations/rands/seeding/rand_unix.c openssl-3.0.1/providers/implementations/rands/seeding/rand_unix.c
---- openssl-3.0.1.orig/providers/implementations/rands/seeding/rand_unix.c	2021-12-24 16:56:23.056304227 +0100
-+++ openssl-3.0.1/providers/implementations/rands/seeding/rand_unix.c	2021-12-24 16:57:03.408290650 +0100
-@@ -453,6 +453,7 @@
-              * system call and this should always succeed which renders
-              * this alternative but essentially identical source moot.
-              */
-+#if !defined(__LSB_VERSION__)  // "syscall()" is not available in LSB
-             if (uname(&un) == 0) {
-                 kernel[0] = atoi(un.release);
-                 p = strchr(un.release, '.');
-@@ -463,6 +464,7 @@
-                     return 0;
-                 }
-             }
-+#endif
-             /* Open /dev/random and wait for it to be readable */
-             if ((fd = open(DEVRANDOM_WAIT, O_RDONLY)) != -1) {
-                 if (DEVRANDM_WAIT_USE_SELECT && fd < FD_SETSIZE) {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/OrthancFramework/Resources/Patches/openssl-3.0.5.patch	Mon Aug 15 15:44:40 2022 +0200
@@ -0,0 +1,53 @@
+diff -urEb openssl-3.0.5.orig/crypto/threads_win.c openssl-3.0.5/crypto/threads_win.c
+--- openssl-3.0.5.orig/crypto/threads_win.c	2022-08-15 15:37:28.944910076 +0200
++++ openssl-3.0.5/crypto/threads_win.c	2022-08-15 15:38:34.120081931 +0200
+@@ -207,13 +207,30 @@
+ int CRYPTO_atomic_or(uint64_t *val, uint64_t op, uint64_t *ret,
+                      CRYPTO_RWLOCK *lock)
+ {
++#if defined(_WIN32) && !defined(_WIN64)
++    /**
++     * Prevents the following error, at least on Visual Studio 2008,
++     * but most probably on any Window 32bit system:
++     * "CoreLibrary.lib(threads_win.obj) : error LNK2019: unresolved
++     * external symbol _InterlockedOr64 referenced in function
++     * _CRYPTO_atomic_or". TODO - The lock should be locked!
++     * https://developercommunity.visualstudio.com/t/-interlockedexchangeadd64-is-unresolved-on-x86/1227636
++     **/
++    *ret = (*val) | op;
++#else
+     *ret = (uint64_t)InterlockedOr64((LONG64 volatile *)val, (LONG64)op) | op;
++#endif
+     return 1;
+ }
+ 
+ int CRYPTO_atomic_load(uint64_t *val, uint64_t *ret, CRYPTO_RWLOCK *lock)
+ {
++#if defined(_WIN32) && !defined(_WIN64)
++    /* See comment above */
++    *ret = *val;
++#else
+     *ret = (uint64_t)InterlockedOr64((LONG64 volatile *)val, 0);
++#endif
+     return 1;
+ }
+ 
+diff -urEb openssl-3.0.5.orig/providers/implementations/rands/seeding/rand_unix.c openssl-3.0.5/providers/implementations/rands/seeding/rand_unix.c
+--- openssl-3.0.5.orig/providers/implementations/rands/seeding/rand_unix.c	2022-08-15 15:37:28.968909770 +0200
++++ openssl-3.0.5/providers/implementations/rands/seeding/rand_unix.c	2022-08-15 15:39:00.963742658 +0200
+@@ -453,6 +453,7 @@
+              * system call and this should always succeed which renders
+              * this alternative but essentially identical source moot.
+              */
++#if !defined(__LSB_VERSION__)  // "syscall()" is not available in LSB
+             if (uname(&un) == 0) {
+                 kernel[0] = atoi(un.release);
+                 p = strchr(un.release, '.');
+@@ -463,6 +464,7 @@
+                     return 0;
+                 }
+             }
++#endif
+             /* Open /dev/random and wait for it to be readable */
+             if ((fd = open(DEVRANDOM_WAIT, O_RDONLY)) != -1) {
+                 if (DEVRANDM_WAIT_USE_SELECT && fd < FD_SETSIZE) {
--- a/OrthancServer/UnitTestsSources/VersionsTests.cpp	Mon Aug 15 15:34:02 2022 +0200
+++ b/OrthancServer/UnitTestsSources/VersionsTests.cpp	Mon Aug 15 15:44:40 2022 +0200
@@ -167,10 +167,10 @@
 #if ORTHANC_ENABLE_SSL == 1
 TEST(Version, OpenSslStatic)
 {
-  // openssl-3.0.1
+  // openssl-3.0.5
   ASSERT_EQ(3 * 0x10000000L +
             0 * 0x00100000L +
-            1 * 0x00000010L +
+            1 * 0x00000050L +
             0 * 0x0000000fL, OPENSSL_VERSION_NUMBER);
 }
 #endif