Skip to content

Commit b2aca8c

Browse files
committed
update yara MbedTLS dependency
1 parent d75b9cf commit b2aca8c

File tree

6 files changed

+13
-84
lines changed

6 files changed

+13
-84
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ To develop plugins for ImHex, use the following template project to get started.
386386
- Thanks to aquynh for [capstone](https://github.com/aquynh/capstone) which is the base of the disassembly window
387387
- Thanks to rxi for [microtar](https://github.com/rxi/microtar) used for extracting downloaded store assets
388388
- Thanks to VirusTotal for [Yara](https://github.com/VirusTotal/yara) used by the Yara plugin
389+
- Thanks to paul-elliot-arm for [Mbed-TLS](https://github.com/Mbed-TLS/mbedtls) used for crypto by the Yara plugin
389390
- Thanks to Martinsos for [edlib](https://github.com/Martinsos/edlib) used for sequence searching in the diffing view
390391
- Thanks to ron4fun for [HashLibPlus](https://github.com/ron4fun/HashLibPlus) which implements every hashing algorithm under the sun
391392
- Thanks to mackron for [miniaudio](https://github.com/mackron/miniaudio) used to play audio files

cmake/build_helpers.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,6 @@ macro(addBundledLibraries)
831831
endif()
832832
enableUnityBuild(libpl)
833833

834-
find_package(mbedTLS 3.4.0 REQUIRED)
835834
find_package(Magic 5.39 REQUIRED)
836835

837836
if (NOT IMHEX_DISABLE_STACKTRACE)

cmake/modules/FindmbedTLS.cmake

Lines changed: 0 additions & 75 deletions
This file was deleted.

dist/ImHex-9999.ebuild

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
EAPI=7
66

7+
RESTRICT="network-sandbox"
78
DESCRIPTION="A hex editor for reverse engineers, programmers, and eyesight"
89
HOMEPAGE="https://github.com/WerWolv/ImHex"
910
SRC_URI=""
10-
EGIT_REPO_URI="https://github.com/WerWolv/ImHex.git"
11-
11+
EGIT_REPO_URI="https://github.com/jopadan/ImHex.git"
1212
inherit git-r3 cmake
1313

1414
LICENSE="GPL-2"
@@ -20,7 +20,7 @@ DEPEND=""
2020
RDEPEND="${DEPEND}
2121
media-libs/glfw
2222
sys-apps/file
23-
net-libs/mbedtls
23+
net-libs/mbedtls:3
2424
dev-cpp/nlohmann_json
2525
sys-apps/dbus
2626
sys-apps/xdg-desktop-portal

dist/get_deps_debian.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,7 @@ apt install -y \
2929
liblzma-dev \
3030
libzstd-dev \
3131
liblz4-dev
32+
33+
echo "deb https://deb.debian.org/debian unstable main" &>> /etc/apt/sources.list
34+
apt-update
35+
apt install -y -t unstable --no-install-recommends libmbedtls-dev

lib/third_party/yara/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ set(LIBYARA_MODULES
102102
${LIBYARA_SOURCE_PATH}/modules/time/time.c
103103
)
104104

105-
find_package(mbedTLS 2.26.0 REQUIRED)
105+
find_package(MbedTLS 3.6.2 REQUIRED)
106106

107107
add_library(libyara STATIC ${LIBYARA_SOURCE} ${LIBYARA_INCLUDES} ${LIBYARA_MODULES})
108108

@@ -122,15 +122,15 @@ endif ()
122122
target_include_directories(
123123
libyara
124124
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/yara> $<BUILD_INTERFACE:${LIBYARA_SOURCE_PATH}/include>
125-
PRIVATE ${LIBYARA_SOURCE_PATH} ${MBEDTLS_INCLUDE_DIR}
125+
PRIVATE ${LIBYARA_SOURCE_PATH} MbedTLS::mbedtls}
126126
)
127127

128-
target_link_directories(libyara PRIVATE ${MBEDTLS_LIBRARY_DIR})
128+
target_link_directories(libyara PRIVATE MbedTLS::mbedtls)
129129

130130
if (UNIX)
131-
target_link_libraries(libyara PRIVATE magic ${MBEDTLS_LIBRARIES} pthread)
131+
target_link_libraries(libyara PRIVATE magic MbedTLS::mbedtls pthread)
132132
else ()
133-
target_link_libraries(libyara PRIVATE magic ${MBEDTLS_LIBRARIES})
133+
target_link_libraries(libyara PRIVATE magic MbedTLS::mbedtls)
134134
endif ()
135135

136136
include(GNUInstallDirs)

0 commit comments

Comments
 (0)