From 43427e73d35286dd07c1de024a33e459b556acb5 Mon Sep 17 00:00:00 2001 From: m-1-k-3 Date: Tue, 4 Apr 2023 17:44:01 +0200 Subject: [PATCH 1/2] fix stacs installation --- installer/I108_stacs_password_search.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/installer/I108_stacs_password_search.sh b/installer/I108_stacs_password_search.sh index ea3a885e6..78bc54765 100755 --- a/installer/I108_stacs_password_search.sh +++ b/installer/I108_stacs_password_search.sh @@ -29,6 +29,7 @@ I108_stacs_password_search() { print_tool_info "python3-pip" 1 print_tool_info "libarchive-dev" 1 print_tool_info "pybind11-dev" 1 + print_tool_info "libssl-dev" 1 # print_pip_info "stacs" print_git_info "stacs" "stacscan/stacs" "STACS is a fast, easy to use tool for searching of password hashes in firmware files." print_git_info "stacs-rules" "stacscan/stacs-rules" "STACS is a fast, easy to use tool for searching of password hashes in firmware files." From cf9cbab577902d55c1fb71199e4a4cedafd674fd Mon Sep 17 00:00:00 2001 From: m-1-k-3 Date: Wed, 5 Apr 2023 10:08:23 +0200 Subject: [PATCH 2/2] fix binwalk - sasquatch installation --- helpers/helpers_emba_dependency_check.sh | 8 ++++---- installer/IP99_binwalk_default.sh | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/helpers/helpers_emba_dependency_check.sh b/helpers/helpers_emba_dependency_check.sh index 91b628812..43c78f9d9 100755 --- a/helpers/helpers_emba_dependency_check.sh +++ b/helpers/helpers_emba_dependency_check.sh @@ -455,11 +455,11 @@ dependency_check() # patool extractor - https://wummel.github.io/patool/ check_dep_tool "patool" - # Freetz-NG - check_dep_file "Freetz-NG fwmod" "$EXT_DIR""/freetz-ng/fwmod" + # Freetz-NG - replaced by unblob + # check_dep_file "Freetz-NG fwmod" "$EXT_DIR""/freetz-ng/fwmod" - # AVM fitimg extraction script - check_dep_file "fitimg script" "$EXT_DIR""/fitimg-0.8/fitimg" + # AVM fitimg extraction script - replaced by unblob + # check_dep_file "fitimg script" "$EXT_DIR""/fitimg-0.8/fitimg" # EnGenius decryptor - https://gist.github.com/ryancdotorg/914f3ad05bfe0c359b79716f067eaa99 check_dep_file "EnGenius decryptor" "$EXT_DIR""/engenius-decrypt.py" diff --git a/installer/IP99_binwalk_default.sh b/installer/IP99_binwalk_default.sh index 534652e07..69a1365c9 100755 --- a/installer/IP99_binwalk_default.sh +++ b/installer/IP99_binwalk_default.sh @@ -137,12 +137,14 @@ IP99_binwalk_default() { fi if ! [[ -d external/binwalk/sasquatch ]]; then - git clone https://github.com/EMBA-support-repos/sasquatch external/binwalk/sasquatch + # git clone https://github.com/EMBA-support-repos/sasquatch external/binwalk/sasquatch + git clone --quiet --depth 1 --branch "master" https://github.com/devttys0/sasquatch external/binwalk/sasquatch fi cd external/binwalk/sasquatch || ( echo "Could not install EMBA component sasquatch" && exit 1 ) # https://github.com/ReFirmLabs/binwalk/issues/618#issuecomment-1432373715 - wget https://github.com/devttys0/sasquatch/pull/47.patch - patch -p1 < 47.patch + # wget https://github.com/devttys0/sasquatch/pull/47.patch + # patch -p1 < 47.patch + wget https://github.com/devttys0/sasquatch/pull/51.patch && patch -p1 <51.patch CFLAGS="-fcommon -Wno-misleading-indentation" ./build.sh -y cd "$HOME_PATH" || ( echo "Could not install EMBA component sasquatch" && exit 1 )