Merge pull request #156 from gm4tr1x/master

Updated test.sh (support for osx and some fixes)

diff --git a/src/oclHashcat.c b/src/oclHashcat.c
index 5ba2c99..5056945 100644 (file)
--- a/src/oclHashcat.c
+++ b/src/oclHashcat.c
@@ -402,8 +402,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
@@ -5156,8 +5156,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
@@ -5319,8 +5319,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
@@ -5634,8 +5634,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;
@@ -6440,9 +6440,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);

diff --git a/tools/test.sh b/tools/test.sh
index 80682f7..1540a8f 100755 (executable)
--- a/tools/test.sh
+++ b/tools/test.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 
 ##
-## Authors.....: Gabriele Gristina <matrix@hashcat.net> / Jens Steube <jens.steube@gmail.com>
+## Authors.....: Gabriele Gristina <matrix@hashcat.net>
+##               Jens Steube <jens.steube@gmail.com>
+##
 ## License.....: MIT
 ##
 
@@ -294,7 +296,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 +1546,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 +1638,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 +1658,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