From de46cb109b85ad8da6ecfad36545b4df70ae2d33 Mon Sep 17 00:00:00 2001
From: Giovanni <561184+wargio@users.noreply.github.com>
Date: Mon, 22 Apr 2024 15:22:09 +0800
Subject: [PATCH] disable openssl for libyara on linux/mac builds and use
 tagged version (#3332)

* disable openssl for libyara on linux/mac builds and use tagged version
* Bump rizin version
---
 dist/bundle_rz_libyara.ps1 | 2 +-
 rizin                      | 2 +-
 scripts/rz-libyara.sh      | 4 ++--
 src/core/Cutter.cpp        | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dist/bundle_rz_libyara.ps1 b/dist/bundle_rz_libyara.ps1
index 984913d6..2f3dafaa 100644
--- a/dist/bundle_rz_libyara.ps1
+++ b/dist/bundle_rz_libyara.ps1
@@ -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
 }
diff --git a/rizin b/rizin
index 3d93397d..34f1a9e7 160000
--- a/rizin
+++ b/rizin
@@ -1 +1 @@
-Subproject commit 3d93397dd8b96ce1e8683a21ab86d94812f0b23f
+Subproject commit 34f1a9e7b40e289cdf8e7f03c145bdbd5d41dc89
diff --git a/scripts/rz-libyara.sh b/scripts/rz-libyara.sh
index 5fdb303c..8941f4b4 100755
--- a/scripts/rz-libyara.sh
+++ b/scripts/rz-libyara.sh
@@ -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
diff --git a/src/core/Cutter.cpp b/src/core/Cutter.cpp
index 0f646b81..b5271ca7 100644
--- a/src/core/Cutter.cpp
+++ b/src/core/Cutter.cpp
@@ -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;