1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-15 20:39:17 +00:00

Merge pull request #3073 from matrix/unit_tests_update

Unit tests: Updated test.sh
This commit is contained in:
Jens Steube 2021-12-26 16:06:58 +01:00 committed by GitHub
commit 47cad04a32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 10 deletions

View File

@ -28,13 +28,14 @@
##
- Association Attack: Enable module specific pw_min and pw_max settings to avoid false positives in -a 9 attack-mode
- Backend Info: Added local memory size to output
- Tuning Database: Added a warning if a module implements module_extra_tuningdb_block but the installed computing device is not found
- Usage Screen: On windows console, wait for any keypress if usage_mini_print() is used
- User Options: Add new module function module_hash_decode_postprocess() to override hash specific configurations from command line
- OpenCL Backend: added workaround to make optimized kernels work on Apple Silicon
- OpenCL Runtime: Added support to use Apple Silicon compute devices
- OpenCL Runtime: Set default device-type to GPU with Apple Silicon compute devices
- Backend Info: Added local memory size to output
- OpenCL Backend: added workaround to make optimized kernels work on Apple Silicon
- Unit tests: Updated test.sh to set default device-type to CPU with Apple Intel, force pure kernel with Apple Silicon and add -f (--force) option
* changes v6.2.4 -> v6.2.5

View File

@ -7,6 +7,8 @@
OPTS="--quiet --potfile-disable --runtime 400 --hwmon-disable"
FORCE=0
TDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# List of TrueCrypt modes which have test containers
@ -2991,6 +2993,8 @@ OPTIONS:
-c Disables markov-chains
-f Use --force to ignore hashcat warnings (default : disabled)
-p Package the tests into a .7z file
-F Use this folder as test folder instead of the default one
@ -3017,7 +3021,7 @@ HT=0
PACKAGE=0
OPTIMIZED=1
while getopts "V:t:m:a:b:hcpd:x:o:d:D:F:POI:s:" opt; do
while getopts "V:t:m:a:b:hcpd:x:o:d:D:F:POI:s:f" opt; do
case ${opt} in
"V")
@ -3116,11 +3120,11 @@ while getopts "V:t:m:a:b:hcpd:x:o:d:D:F:POI:s:" opt; do
;;
"O")
# optimized is already default, ignore it
# optimized is already default, ignore it
;;
"d")
OPTS="${OPTS} -d ${OPTARG}"
OPTS="${OPTS} -d ${OPTARG}"
;;
"D")
@ -3137,12 +3141,16 @@ while getopts "V:t:m:a:b:hcpd:x:o:d:D:F:POI:s:" opt; do
;;
"F")
OUTD=$( echo "${OPTARG}" | sed 's!/$!!g' )
OUTD=$( echo "${OPTARG}" | sed 's!/$!!g' )
;;
"P")
OPTIMIZED=0
KERNEL_TYPE="Pure"
OPTIMIZED=0
KERNEL_TYPE="Pure"
;;
"f")
FORCE=1
;;
\?)
@ -3156,6 +3164,24 @@ while getopts "V:t:m:a:b:hcpd:x:o:d:D:F:POI:s:" opt; do
done
IS_APPLE_SILICON=0
# handle Apple M1 bugs with optimized kernels
if [ ${OPTIMIZED} -eq 1 ]; then
BIN_sysctl=$(which sysctl)
if [ $? -eq 0 ]; then
CPU_TYPE=$(sysctl hw.cputype | awk '{print $2}')
# with Apple's M1, disable optimized kernel
if [ ${CPU_TYPE} -eq 16777228 ]; then
OPTIMIZED=0
KERNEL_TYPE="Pure"
IS_APPLE_SILICON=1
fi
fi
fi
export IS_OPTIMIZED=${OPTIMIZED}
if [ "${OPTIMIZED}" -eq 1 ]; then
@ -3163,8 +3189,17 @@ if [ "${OPTIMIZED}" -eq 1 ]; then
fi
if [ "${TYPE}" = "null" ]; then
OPTS="${OPTS} -D 2"
TYPE="Gpu"
if [ $(uname) == "Darwin" ] && [ ${IS_APPLE_SILICON} -eq 0 ]; then
OPTS="${OPTS} -D 1"
TYPE="Cpu"
else
OPTS="${OPTS} -D 2"
TYPE="Gpu"
fi
fi
if [ ${FORCE} -eq 1 ]; then
OPTS="${OPTS} --force"
fi
if [ -n "${ARCHITECTURE}" ]; then