Mercurial > hg > orthanc

comparison OrthancFramework/Resources/Patches/openssl-3.0.5.patch @ 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
children
comparison
equal deleted inserted replaced
5067:6ad2bea0e07e 5068:02fae039a15d
1 diff -urEb openssl-3.0.5.orig/crypto/threads_win.c openssl-3.0.5/crypto/threads_win.c
2 --- openssl-3.0.5.orig/crypto/threads_win.c 2022-08-15 15:37:28.944910076 +0200
3 +++ openssl-3.0.5/crypto/threads_win.c 2022-08-15 15:38:34.120081931 +0200
4 @@ -207,13 +207,30 @@
5 int CRYPTO_atomic_or(uint64_t *val, uint64_t op, uint64_t *ret,
6 CRYPTO_RWLOCK *lock)
7 {
8 +#if defined(_WIN32) && !defined(_WIN64)
9 + /**
10 + * Prevents the following error, at least on Visual Studio 2008,
11 + * but most probably on any Window 32bit system:
12 + * "CoreLibrary.lib(threads_win.obj) : error LNK2019: unresolved
13 + * external symbol _InterlockedOr64 referenced in function
14 + * _CRYPTO_atomic_or". TODO - The lock should be locked!
15 + * https://developercommunity.visualstudio.com/t/-interlockedexchangeadd64-is-unresolved-on-x86/1227636
16 + **/
17 + *ret = (*val) | op;
18 +#else
19 *ret = (uint64_t)InterlockedOr64((LONG64 volatile *)val, (LONG64)op) | op;
20 +#endif
21 return 1;
22 }
23
24 int CRYPTO_atomic_load(uint64_t *val, uint64_t *ret, CRYPTO_RWLOCK *lock)
25 {
26 +#if defined(_WIN32) && !defined(_WIN64)
27 + /* See comment above */
28 + *ret = *val;
29 +#else
30 *ret = (uint64_t)InterlockedOr64((LONG64 volatile *)val, 0);
31 +#endif
32 return 1;
33 }
34
35 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
36 --- openssl-3.0.5.orig/providers/implementations/rands/seeding/rand_unix.c 2022-08-15 15:37:28.968909770 +0200
37 +++ openssl-3.0.5/providers/implementations/rands/seeding/rand_unix.c 2022-08-15 15:39:00.963742658 +0200
38 @@ -453,6 +453,7 @@
39 * system call and this should always succeed which renders
40 * this alternative but essentially identical source moot.
41 */
42 +#if !defined(__LSB_VERSION__) // "syscall()" is not available in LSB
43 if (uname(&un) == 0) {
44 kernel[0] = atoi(un.release);
45 p = strchr(un.release, '.');
46 @@ -463,6 +464,7 @@
47 return 0;
48 }
49 }
50 +#endif
51 /* Open /dev/random and wait for it to be readable */
52 if ((fd = open(DEVRANDOM_WAIT, O_RDONLY)) != -1) {
53 if (DEVRANDM_WAIT_USE_SELECT && fd < FD_SETSIZE) {