From cd90af34a07cc9defea9d931371e3f89ca807ed2 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 11 Sep 2024 16:21:29 -0400 Subject: [PATCH] add opencl support to CheckFileExist() CheckExecute() has a flag to tell it if a check needs opencl support or not and can automatically disable the check if opencl checks are not requested. Mostly copy and paste the same feature into CheckFileExist and add it where needed. --- tools/pm3_tests.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/pm3_tests.sh b/tools/pm3_tests.sh index 8fed2051ae..d5a73fb62e 100755 --- a/tools/pm3_tests.sh +++ b/tools/pm3_tests.sh @@ -140,11 +140,22 @@ C_NC='\033[0m' # No Color C_OK='\xe2\x9c\x94\xef\xb8\x8f' C_FAIL='\xe2\x9d\x8c' -# title, file name or file wildcard to check +# [opencl] title, file name or file wildcard to check function CheckFileExist() { + if [ "$1" == "opencl" ]; then + local OPENCLTEST=true + shift + else + local OPENCLTEST=false + fi printf "%-40s" "$1 " + if $OPENCLTEST && ! $OPENCLTESTS; then + echo -e "[ ${C_YELLOW}SKIPPED${C_NC} ] ( opencl )" + return 0 + fi + if [ -f "$2" ]; then echo -e "[ ${C_GREEN}OK${C_NC} ] ${C_OK}" return 0 @@ -386,7 +397,7 @@ while true; do if ! CheckExecute slow "ht2crack5 test" "cd $HT2CRACK5PATH; ./ht2crack5 $HT2CRACK5UID $HT2CRACK5NRAR" "Key: $HT2CRACK5KEY"; then break; fi echo -e "\n${C_BLUE}Testing ht2crack5opencl:${C_NC} ${HT2CRACK5OPENCLPATH:=./tools/hitag2crack/crack5opencl/}" - if ! CheckFileExist "ht2crack5opencl exists" "$HT2CRACK5OPENCLPATH/ht2crack5opencl"; then break; fi + if ! CheckFileExist opencl "ht2crack5opencl exists" "$HT2CRACK5OPENCLPATH/ht2crack5opencl"; then break; fi HT2CRACK5OPENCLUID=12345678 HT2CRACK5OPENCLKEY=AABBCCDDEEFF # The speed depends on the nRaR so we'll use two pairs known to work fast