ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-18 10:56:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

disable openssl for libyara on linux/mac builds and use tagged version (#3332)

Browse Source 
* disable openssl for libyara on linux/mac builds and use tagged version
* Bump rizin version
This commit is contained in:
Giovanni 2024-04-22 15:22:09 +08:00 committed by GitHub
parent bce9fe7732
commit de46cb109b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/bundle_rz_libyara.ps1 vendored
View File

@ -3,7 +3,7 @@ $cmake_opts = $args[1]
$python = Split-Path((Get-Command python.exe).Path) $python = Split-Path((Get-Command python.exe).Path)
if (-not (Test-Path -Path 'rz_libyara' -PathType Container)) { if (-not (Test-Path -Path 'rz_libyara' -PathType Container)) {
git clone https://github.com/rizinorg/rz-libyara.git --depth 1 rz_libyara git clone https://github.com/rizinorg/rz-libyara.git --depth 1 --branch main rz_libyara
git -C rz_libyara submodule init git -C rz_libyara submodule init
git -C rz_libyara submodule update git -C rz_libyara submodule update
} }

2
rizin

@ -1 +1 @@
Subproject commit 3d93397dd8b96ce1e8683a21ab86d94812f0b23f Subproject commit 34f1a9e7b40e289cdf8e7f03c145bdbd5d41dc89

4
scripts/rz-libyara.sh
View File

@ -8,14 +8,14 @@ EXTRA_CMAKE_OPTS="$2"
cd "$SCRIPTPATH/.." cd "$SCRIPTPATH/.."
if [[ ! -d rz_libyara ]]; then if [[ ! -d rz_libyara ]]; then
git clone https://github.com/rizinorg/rz-libyara.git --depth 1 rz_libyara git clone https://github.com/rizinorg/rz-libyara.git --depth 1 --branch main rz_libyara
git -C rz_libyara submodule init git -C rz_libyara submodule init
git -C rz_libyara submodule update git -C rz_libyara submodule update
fi fi
cd rz_libyara cd rz_libyara
meson --buildtype=release --pkg-config-path="$INSTALL_PREFIX/lib/pkgconfig" --prefix="$INSTALL_PREFIX" -Duse_sys_yara=disabled build meson --buildtype=release --pkg-config-path="$INSTALL_PREFIX/lib/pkgconfig" --prefix="$INSTALL_PREFIX" -Denable_openssl=false -Duse_sys_yara=disabled build
ninja -C build install ninja -C build install
cd cutter-plugin cd cutter-plugin

6
src/core/Cutter.cpp
View File

@ -3418,13 +3418,13 @@ QList<SectionDescription> CutterCore::getAllSections()
section.size = sect->size; section.size = sect->size;
section.perm = rz_str_rwx_i(sect->perm); section.perm = rz_str_rwx_i(sect->perm);
if (sect->size > 0) { if (sect->size > 0) {
HtPP *digests = rz_core_bin_create_digests(core, sect->paddr, sect->size, hashnames); HtSS *digests = rz_core_bin_create_digests(core, sect->paddr, sect->size, hashnames);
if (!digests) { if (!digests) {
continue; continue;
} }
const char *entropy = (const char *)ht_pp_find(digests, "entropy", NULL); const char *entropy = (const char *)ht_ss_find(digests, "entropy", NULL);
section.entropy = rz_str_get(entropy); section.entropy = rz_str_get(entropy);
ht_pp_free(digests); ht_ss_free(digests);
} }
sections << section; sections << section;