Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Apr 22, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c6bd79
disable openssl for libyara on linux/mac builds and use tagged version
wargio Apr 12, 2024
f18b37a
Bump rizin version
wargio Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/bundle_rz_libyara.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ $cmake_opts = $args[1]
$python = Split-Path((Get-Command python.exe).Path)

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 update
}
Expand Down
2 changes: 1 addition & 1 deletion rizin
Open in desktop
Submodule rizin updated 285 files
4 changes: 2 additions & 2 deletions scripts/rz-libyara.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ EXTRA_CMAKE_OPTS="$2"
cd "$SCRIPTPATH/.."

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 update
fi

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

cd cutter-plugin
Expand Down
6 changes: 3 additions & 3 deletions src/core/Cutter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3418,13 +3418,13 @@ QList<SectionDescription> CutterCore::getAllSections()
section.size = sect->size;
section.perm = rz_str_rwx_i(sect->perm);
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) {
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);
ht_pp_free(digests);
ht_ss_free(digests);
}

sections << section;
Expand Down
Loading