Merge d4d20e4443 into c76f11a523

Fix openssl engine support on Fedora Rawhide

.github/workflows/fedora-rawhide.yml

@@ -25,7 +25,7 @@ jobs:
         submodules: true
     - name: Install dependencies
       run: |
-        dnf -y install git cmake ncurses-devel openssl-devel libsodium-devel readline-devel zlib-devel gcc-c++ clang
+        dnf -y install git cmake ncurses-devel openssl-devel-engine libsodium-devel readline-devel zlib-devel gcc-c++ clang
     - name: Compile with ${{ matrix.cc }}
       run: |
         export CC=${{ matrix.cc }}

src/Mayaqua/CMakeLists.txt

@@ -90,10 +90,7 @@ if(WIN32)
     add_subdirectory(3rdparty/liboqs)
     add_subdirectory(3rdparty/oqs-provider)
 
-    target_include_directories(oqsprovider PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/3rdparty/liboqs/include)
-    get_target_property(target_include_dirs oqsprovider INCLUDE_DIRECTORIES)
-    message("Include directories for target_name: ${target_include_dirs}")
-    
+    target_include_directories(oqsprovider PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/3rdparty/liboqs/include)    
     set_property(TARGET oqsprovider PROPERTY POSITION_INDEPENDENT_CODE ON)
     target_link_libraries(mayaqua PRIVATE oqsprovider)
   endif()
@@ -128,9 +125,6 @@ if(UNIX)
     add_subdirectory(3rdparty/oqs-provider)
 
     target_include_directories(oqsprovider PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/3rdparty/liboqs/include)
-    get_target_property(target_include_dirs oqsprovider INCLUDE_DIRECTORIES)
-    message("Include directories for target_name: ${target_include_dirs}")
-    
     set_property(TARGET oqsprovider PROPERTY POSITION_INDEPENDENT_CODE ON)
     target_link_libraries(mayaqua PRIVATE oqsprovider)
   endif()

src/Mayaqua/Encrypt.c

@@ -20,7 +20,9 @@
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
+#ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
+#endif
 #include <openssl/bio.h>
 #include <openssl/x509.h>
 #include <openssl/pkcs7.h>