From f00617f992cbe0014c6a98be3296d1eaff9f826a Mon Sep 17 00:00:00 2001 From: Gabriele 'matrix' Gristina Date: Sun, 24 Jan 2016 17:31:31 +0100 Subject: [PATCH 1/3] Updated test.sh (support for osx and some fixes) --- tools/test.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/test.sh b/tools/test.sh index 80682f7ff..918b98593 100755 --- a/tools/test.sh +++ b/tools/test.sh @@ -294,7 +294,7 @@ function status() ;; *) - echo "! unhandled return code ${RET}, cmdline : ${CMD}" $>> ${OUTD}/logfull.txt + echo "! unhandled return code ${RET}, cmdline : ${CMD}" &>> ${OUTD}/logfull.txt echo "! unhandled return code, see ${OUTD}/logfull.txt for details." ((e_nf++)) ;; @@ -1544,6 +1544,7 @@ OPTIONS: -o Select operating system : 'win' => windows operating system (use .exe file extension etc) 'linux' => *nix based operating systems (.bin for binaries) + 'osx' => mac osx operating systems (.app for binaries) -c Disables markov-chains @@ -1635,6 +1636,8 @@ while getopts "t:m:a:b:hcpd:x:o:" opt; do EXTENSION="exe" elif [ ${OPTARG} == "linux" ]; then EXTENSION="bin" + elif [ ${OPTARG} == "osx" ]; then + EXTENSION="app" else usage fi @@ -1653,13 +1656,13 @@ done if [ -n "${ARCHITECTURE}" ]; then - BIN=$( echo ${BIN} | sed "s!64!${ARCHITECTURE}!" ) + BIN="${BIN}${ARCHITECTURE}" fi if [ -n "${EXTENSION}" ]; then - BIN=$( echo ${BIN} | sed "s!\.bin!\.${EXTENSION}!" ) + BIN="${BIN}.${EXTENSION}" fi From 479327fc20b1678d8d25c9cd6f422bf685fef769 Mon Sep 17 00:00:00 2001 From: Gabriele 'matrix' Gristina Date: Sun, 24 Jan 2016 17:49:15 +0100 Subject: [PATCH 2/3] Re-enable gpu-temp-disable argument for osx build --- src/oclHashcat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/oclHashcat.c b/src/oclHashcat.c index bd689834f..84e26ee43 100644 --- a/src/oclHashcat.c +++ b/src/oclHashcat.c @@ -400,8 +400,8 @@ const char *USAGE_BIG[] = " -w, --workload-profile=NUM Enable a specific workload profile, see references below", " -n, --kernel-accel=NUM Workload tuning: 1, 8, 40, 80, 160", " -u, --kernel-loops=NUM Workload fine-tuning: 8 - 1024", - #ifdef HAVE_HWMON " --gpu-temp-disable Disable temperature and fanspeed readings and triggers", + #ifdef HAVE_HWMON " --gpu-temp-abort=NUM Abort session if GPU temperature reaches NUM degrees celsius", " --gpu-temp-retain=NUM Try to retain GPU temperature at NUM degrees celsius (AMD only)", #ifdef HAVE_ADL @@ -5153,8 +5153,8 @@ int main (int argc, char **argv) uint workload_profile = WORKLOAD_PROFILE; uint kernel_accel = KERNEL_ACCEL; uint kernel_loops = KERNEL_LOOPS; - #ifdef HAVE_HWMON uint gpu_temp_disable = GPU_TEMP_DISABLE; + #ifdef HAVE_HWMON uint gpu_temp_abort = GPU_TEMP_ABORT; uint gpu_temp_retain = GPU_TEMP_RETAIN; #ifdef HAVE_ADL @@ -5316,8 +5316,8 @@ int main (int argc, char **argv) {"workload-profile", required_argument, 0, IDX_WORKLOAD_PROFILE}, {"kernel-accel", required_argument, 0, IDX_KERNEL_ACCEL}, {"kernel-loops", required_argument, 0, IDX_KERNEL_LOOPS}, - #ifdef HAVE_HWMON {"gpu-temp-disable", no_argument, 0, IDX_GPU_TEMP_DISABLE}, + #ifdef HAVE_HWMON {"gpu-temp-abort", required_argument, 0, IDX_GPU_TEMP_ABORT}, {"gpu-temp-retain", required_argument, 0, IDX_GPU_TEMP_RETAIN}, #ifdef HAVE_ADL @@ -5631,8 +5631,8 @@ int main (int argc, char **argv) kernel_accel_chgd = 1; break; case IDX_KERNEL_LOOPS: kernel_loops = atoi (optarg); kernel_loops_chgd = 1; break; - #ifdef HAVE_HWMON case IDX_GPU_TEMP_DISABLE: gpu_temp_disable = 1; break; + #ifdef HAVE_HWMON case IDX_GPU_TEMP_ABORT: gpu_temp_abort = atoi (optarg); #ifdef HAVE_ADL gpu_temp_abort_chgd = 1; @@ -6437,9 +6437,9 @@ int main (int argc, char **argv) logfile_top_uint (force); logfile_top_uint (kernel_accel); logfile_top_uint (kernel_loops); + logfile_top_uint (gpu_temp_disable); #ifdef HAVE_HWMON logfile_top_uint (gpu_temp_abort); - logfile_top_uint (gpu_temp_disable); logfile_top_uint (gpu_temp_retain); #endif logfile_top_uint (hash_mode); From fed3af1d4a5db81053520549f0aecad16c954027 Mon Sep 17 00:00:00 2001 From: Gabriele 'matrix' Gristina Date: Sun, 24 Jan 2016 17:54:13 +0100 Subject: [PATCH 3/3] Cosmetic fix --- tools/test.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/test.sh b/tools/test.sh index 918b98593..1540a8f39 100755 --- a/tools/test.sh +++ b/tools/test.sh @@ -1,7 +1,9 @@ #!/bin/bash ## -## Authors.....: Gabriele Gristina / Jens Steube +## Authors.....: Gabriele Gristina +## Jens Steube +## ## License.....: MIT ##