Merge pull request #704 from m-1-k-3/qnap_strict_check

make qnap check strict mode compatible
e-m-b-a · Jul 17, 2023 · af37409 · af37409
2 parents f31f57e + a050a9f
commit af37409
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/config/trickest_blacklist.txt b/config/trickest_blacklist.txt
@@ -122,3 +122,7 @@ uptane/asn1
 sgoldthorpe/karmalb
 jgsqware/clairctl
 Live-Hack-CVE/
+jasnow/585-652-ruby-advisory-db
+pvergain/github-stars
+scordero1234/java_sec_demo-main
+BFHS-Robotics/BFHS-
diff --git a/modules/P02_firmware_bin_file_check.sh b/modules/P02_firmware_bin_file_check.sh
@@ -144,7 +144,7 @@ fw_bin_detector() {
   # we are running binwalk on the file to analyze the output afterwards:
   "${BINWALK_BIN[@]}" "$CHECK_FILE" > "$TMP_DIR"/s02_binwalk_output.txt
   if [[ -f "$TMP_DIR"/s02_binwalk_output.txt ]]; then
-    QNAP_ENC_CHECK=$(grep -a -i "qnap encrypted" "$TMP_DIR"/s02_binwalk_output.txt)
+    QNAP_ENC_CHECK=$(grep -a -i "qnap encrypted" "$TMP_DIR"/s02_binwalk_output.txt || true)
   else
     QNAP_ENC_CHECK=$("${BINWALK_BIN[@]}" -y "qnap encrypted" "$CHECK_FILE")
   fi