From bdd5a8d1b337f04a7b961337464d76748961cb3b Mon Sep 17 00:00:00 2001 From: afjoseph <7126721+afjoseph@users.noreply.github.com> Date: Thu, 21 Mar 2024 11:27:38 +0100 Subject: [PATCH 1/3] Force openssl in CMake targets --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index fa6558fa..4a431c87 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,7 @@ project(rz-ghidra) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") find_package(Rizin REQUIRED Core) +find_package(OpenSSL REQUIRED) set(RIZIN_INSTALL_PLUGDIR "${Rizin_PLUGINDIR}" CACHE STRING "Directory to install rizin plugins into") @@ -80,6 +81,7 @@ endif() add_library(core_ghidra SHARED ${CORE_SOURCE}) target_link_libraries(core_ghidra ghidra_libdecomp) +target_link_libraries(core_ghidra ${OPENSSL_LIBRARIES}) target_link_libraries(core_ghidra pugixml) target_link_libraries(core_ghidra Rizin::Core) set_target_properties(core_ghidra PROPERTIES @@ -105,6 +107,7 @@ endif() if(BUILD_SLEIGH_PLUGIN) add_library(asm_ghidra SHARED ${ASM_SOURCE}) target_link_libraries(asm_ghidra core_ghidra) +target_link_libraries(asm_ghidra ${OPENSSL_LIBRARIES}) set_target_properties(asm_ghidra PROPERTIES OUTPUT_NAME asm_ghidra BUILD_RPATH "${LD_RPATH_STR}" @@ -113,6 +116,7 @@ set_target_properties(asm_ghidra PROPERTIES add_library(analysis_ghidra SHARED ${ANALYSIS_SOURCE}) target_link_libraries(analysis_ghidra core_ghidra) +target_link_libraries(analysis_ghidra ${OPENSSL_LIBRARIES}) set_target_properties(analysis_ghidra PROPERTIES OUTPUT_NAME analysis_ghidra BUILD_RPATH "${LD_RPATH_STR}" From 379a65a459194606b862e9f5190dbcef65a17f5d Mon Sep 17 00:00:00 2001 From: afjoseph <7126721+afjoseph@users.noreply.github.com> Date: Thu, 21 Mar 2024 12:13:27 +0100 Subject: [PATCH 2/3] fixup! Force openssl in CMake targets --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a431c87..2aebcef4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,6 +80,7 @@ set(ANALYSIS_SOURCE endif() add_library(core_ghidra SHARED ${CORE_SOURCE}) +target_include_directories(core_ghidra PRIVATE ${OPENSSL_INCLUDE_DIR}) target_link_libraries(core_ghidra ghidra_libdecomp) target_link_libraries(core_ghidra ${OPENSSL_LIBRARIES}) target_link_libraries(core_ghidra pugixml) @@ -106,6 +107,7 @@ endif() if(BUILD_SLEIGH_PLUGIN) add_library(asm_ghidra SHARED ${ASM_SOURCE}) +target_include_directories(asm_ghidra PRIVATE ${OPENSSL_INCLUDE_DIR}) target_link_libraries(asm_ghidra core_ghidra) target_link_libraries(asm_ghidra ${OPENSSL_LIBRARIES}) set_target_properties(asm_ghidra PROPERTIES @@ -115,6 +117,7 @@ set_target_properties(asm_ghidra PROPERTIES PREFIX "") add_library(analysis_ghidra SHARED ${ANALYSIS_SOURCE}) +target_include_directories(analysis_ghidra PRIVATE ${OPENSSL_INCLUDE_DIR}) target_link_libraries(analysis_ghidra core_ghidra) target_link_libraries(analysis_ghidra ${OPENSSL_LIBRARIES}) set_target_properties(analysis_ghidra PROPERTIES From 8bde5703c26e364a3636277d89aa7ae1f966ff81 Mon Sep 17 00:00:00 2001 From: afjoseph <7126721+afjoseph@users.noreply.github.com> Date: Thu, 21 Mar 2024 12:57:12 +0100 Subject: [PATCH 3/3] fixup! Force openssl in CMake targets --- scripts/Dockerfile.buster | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Dockerfile.buster b/scripts/Dockerfile.buster index ce5dece5..ec3c3b93 100644 --- a/scripts/Dockerfile.buster +++ b/scripts/Dockerfile.buster @@ -2,7 +2,7 @@ FROM debian:buster RUN apt-get update -RUN apt-get -y install git g++ cmake pkg-config flex bison python3 python3-pip ninja-build qt5-default libqt5svg5-dev qttools5-dev && \ +RUN apt-get -y install git g++ cmake pkg-config flex bison python3 python3-pip ninja-build qt5-default libqt5svg5-dev qttools5-dev libssl-dev openssl-dev && \ pip3 install meson RUN cd /root && \