Mercurial > hg > orthanc
view OrthancFramework/Resources/Patches/openssl-3.0.5.patch @ 5073:859f3668c181
replaced macro "#warning" by "#pragma message" for Visual Studio
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 16 Aug 2022 11:06:25 +0200 |
parents | 02fae039a15d |
children |
line wrap: on
line source
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) {