ab6fbdc44a
With OpenSSL soon to be updated to 3.0, the gost engine will have to be bumped as well. Gost 3.0.0.1 will not build with OpenSSL 1.1. To avoid disruption, this commit detects the OpenSSL version from ENGINES_DIR in include/openssl-engin, and sets the package version accordingly. Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
56 lines
2.3 KiB
Diff
56 lines
2.3 KiB
Diff
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -357,9 +357,11 @@ set_target_properties(lib_gost_engine PR
|
|
COMPILE_DEFINITIONS "BUILDING_ENGINE_AS_LIBRARY"
|
|
PUBLIC_HEADER gost-engine.h
|
|
OUTPUT_NAME "gost")
|
|
-target_link_libraries(lib_gost_engine PRIVATE gost_core gost_err)
|
|
+#target_link_libraries(lib_gost_engine PRIVATE gost_core gost_err)
|
|
+target_link_libraries(lib_gost_engine PRIVATE gost_core)
|
|
endif()
|
|
|
|
+if (0)
|
|
# The GOST provider uses this
|
|
add_subdirectory(libprov)
|
|
|
|
@@ -384,6 +386,7 @@ set_target_properties(lib_gost_prov PROP
|
|
)
|
|
target_link_libraries(lib_gost_prov PRIVATE gost_core libprov)
|
|
endif()
|
|
+endif()
|
|
|
|
set(GOST_SUM_SOURCE_FILES
|
|
gostsum.c
|
|
@@ -424,15 +427,15 @@ install(FILES gostsum.1 gost12sum.1 DEST
|
|
install(TARGETS gost_engine EXPORT GostEngineConfig
|
|
LIBRARY DESTINATION ${OPENSSL_ENGINES_DIR}
|
|
RUNTIME DESTINATION ${OPENSSL_ENGINES_DIR})
|
|
-install(TARGETS gost_prov EXPORT GostProviderConfig
|
|
- LIBRARY DESTINATION ${OPENSSL_MODULES_DIR}
|
|
- RUNTIME DESTINATION ${OPENSSL_MODULES_DIR})
|
|
+#install(TARGETS gost_prov EXPORT GostProviderConfig
|
|
+# LIBRARY DESTINATION ${OPENSSL_MODULES_DIR}
|
|
+# RUNTIME DESTINATION ${OPENSSL_MODULES_DIR})
|
|
if (NOT MSVC)
|
|
# install engine and provider in library form
|
|
install(TARGETS lib_gost_engine EXPORT GostEngineConfig
|
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
-install(TARGETS lib_gost_prov EXPORT GostProviderConfig
|
|
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
+#install(TARGETS lib_gost_prov EXPORT GostProviderConfig
|
|
+# LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
endif()
|
|
|
|
if (MSVC)
|
|
@@ -440,8 +443,8 @@ if (MSVC)
|
|
EXPORT GostEngineConfig DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
|
|
install(FILES $<TARGET_PDB_FILE:gost_engine>
|
|
EXPORT GostEngineConfig DESTINATION ${OPENSSL_ENGINES_DIR} OPTIONAL)
|
|
- install(FILES $<TARGET_PDB_FILE:gost_prov>
|
|
- EXPORT GostProviderConfig DESTINATION ${OPENSSL_MODULES_DIR} OPTIONAL)
|
|
+# install(FILES $<TARGET_PDB_FILE:gost_prov>
|
|
+# EXPORT GostProviderConfig DESTINATION ${OPENSSL_MODULES_DIR} OPTIONAL)
|
|
endif()
|
|
install(EXPORT GostEngineConfig DESTINATION GostEngine/share/cmake/GostEngine)
|
|
-install(EXPORT GostProviderConfig DESTINATION GostEngine/share/cmake/GostProvider)
|
|
+#install(EXPORT GostProviderConfig DESTINATION GostEngine/share/cmake/GostProvider)
|