Mercurial > hg > orthanc

changeset 4705:2b3db9d08fe2 openssl-3.x

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes for OS X and Visual Studio
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 22 Jun 2021 08:56:34 +0200
parents f0038043fb97
children a53a58489cc0
files OrthancFramework/Resources/CMake/OpenSslConfigurationStatic-3.0.cmake
diffstat 1 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Resources/CMake/OpenSslConfigurationStatic-3.0.cmake	Tue Jun 22 07:37:20 2021 +0200
+++ b/OrthancFramework/Resources/CMake/OpenSslConfigurationStatic-3.0.cmake	Tue Jun 22 08:56:34 2021 +0200
@@ -281,6 +281,8 @@
 
 
 list(REMOVE_ITEM OPENSSL_SOURCES
+  # Files below are not part of the "libcrypto.a" and "libssl.a" that
+  # are created by compiling OpenSSL from sources
   ${OPENSSL_SOURCES_DIR}/crypto/LPdir_nyi.c
   ${OPENSSL_SOURCES_DIR}/crypto/LPdir_unix.c
   ${OPENSSL_SOURCES_DIR}/crypto/LPdir_vms.c
@@ -306,6 +308,9 @@
   ${OPENSSL_SOURCES_DIR}/engines/e_loader_attic.c
   ${OPENSSL_SOURCES_DIR}/providers/common/securitycheck_fips.c
   ${OPENSSL_SOURCES_DIR}/providers/implementations/macs/blake2_mac_impl.c
+  
+  ${OPENSSL_SOURCES_DIR}/engines/e_afalg.c  # Fails on OS X and Visual Studio
+  ${OPENSSL_SOURCES_DIR}/crypto/poly1305/poly1305_ieee754.c  # Fails on Visual Studio
 
   ${OPENSSL_SOURCES_DIR}/ssl/ktls.c   # TODO ?
   )
@@ -314,10 +319,15 @@
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
     ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD" OR
     ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR
-    ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
+    ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" OR
+    APPLE)
   list(APPEND OPENSSL_SOURCES
     ${OPENSSL_SOURCES_DIR}/providers/implementations/rands/seeding/rand_unix.c
     )
+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
+  list(APPEND OPENSSL_SOURCES
+    ${OPENSSL_SOURCES_DIR}/providers/implementations/rands/seeding/rand_win.c
+    )  
 endif()