1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-23 07:08:19 +00:00

tests: fixed new problem with -m 20510 and hash type ranges

This commit is contained in:
philsmd 2020-01-13 10:40:28 +01:00 committed by GitHub
parent 89f9ef45b6
commit 587ca752e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2979,13 +2979,6 @@ if [ "${TYPE}" = "null" ]; then
TYPE="Gpu"
fi
if [ "${HT}" -eq 20510 ]; then # special case for PKZIP Master Key
if [ "${MODE}" -eq 1 ]; then # if "multi" was forced we need to exit
echo "ERROR: -m 20510 = PKZIP Master Key can only be run with a single hash"
exit 1
fi
fi
if [ -n "${ARCHITECTURE}" ]; then
BIN="${BIN}${ARCHITECTURE}"
@ -3117,6 +3110,18 @@ if [ "${PACKAGE}" -eq 0 ] || [ -z "${PACKAGE_FOLDER}" ]; then
fi
fi
if [ "${hash_type}" -eq 20510 ]; then # special case for PKZIP Master Key
if [ "${MODE}" -eq 1 ]; then # if "multi" was forced we need to skip it
if [ "${HT_MIN}" -lt "${HT_MAX}" ]; then
echo "WARNING: -m 20510 = PKZIP Master Key can only be run with a single hash"
else
echo "ERROR: -m 20510 = PKZIP Master Key can only be run with a single hash"
fi
continue
fi
fi
if [ -z "${PACKAGE_FOLDER}" ]; then
# init test data