From 335ed094789d55107de1d332e2d2f072861fb4f4 Mon Sep 17 00:00:00 2001
From: jsteube <jens.steube@gmail.com>
Date: Wed, 19 Jul 2017 18:41:53 +0200
Subject: [PATCH] Fix test script settings for -m 15400 with new settings from
 interface.c

---
 tools/test.pl |  6 +++++-
 tools/test.sh | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/tools/test.pl b/tools/test.pl
index ae5fe7b74..c6e54308a 100755
--- a/tools/test.pl
+++ b/tools/test.pl
@@ -3756,7 +3756,7 @@ sub single
   {
     my $mode = $modes[$j];
 
-    if ($mode == 0 || $mode == 100 || $mode == 101 || $mode == 133 || $mode == 200 || $mode == 300 || $mode == 600 || $mode == 900 || $mode == 1000 || $mode == 1300 || $mode == 1400 || $mode == 1700 || $mode == 2600 || $mode == 3500 || $mode == 4300 || $mode == 4400 || $mode == 4500 || $mode == 4600 || $mode == 4700 || $mode == 5000 || $mode == 5100 || $mode == 5300 || $mode == 5400 || $mode == 6000 || $mode == 6100 || $mode == 6600 || $mode == 6900 || $mode == 5700 || $mode == 8200 || $mode == 8300 || $mode == 9900 || $mode == 10800 || $mode == 11500 || $mode == 13300 || $mode == 15400 || $mode == 99999)
+    if ($mode == 0 || $mode == 100 || $mode == 101 || $mode == 133 || $mode == 200 || $mode == 300 || $mode == 600 || $mode == 900 || $mode == 1000 || $mode == 1300 || $mode == 1400 || $mode == 1700 || $mode == 2600 || $mode == 3500 || $mode == 4300 || $mode == 4400 || $mode == 4500 || $mode == 4600 || $mode == 4700 || $mode == 5000 || $mode == 5100 || $mode == 5300 || $mode == 5400 || $mode == 6000 || $mode == 6100 || $mode == 6600 || $mode == 6900 || $mode == 5700 || $mode == 8200 || $mode == 8300 || $mode == 9900 || $mode == 10800 || $mode == 11500 || $mode == 13300 || $mode == 99999)
     {
       for (my $i = 1; $i < 32; $i++)
       {
@@ -4725,6 +4725,10 @@ sub single
         }
       }
     }
+    elsif ($mode == 15400)
+    {
+      rnd ($mode, 32, 0);
+    }
     elsif ($mode == 15500)
     {
       for (my $i = 1; $i < 16; $i++)
diff --git a/tools/test.sh b/tools/test.sh
index f21d65f98..071b110a1 100755
--- a/tools/test.sh
+++ b/tools/test.sh
@@ -252,6 +252,8 @@ function init()
     min_len=23
   elif [ "${hash_type}" -eq 14900 ]; then
     min_len=9
+  elif [ "${hash_type}" -eq 15400 ]; then
+    min_len=31
   fi
 
   while read -u 9 pass; do
@@ -300,6 +302,8 @@ function init()
     min_len=23
   elif [ "${hash_type}" -eq 14900 ]; then
     min_len=9
+  elif [ "${hash_type}" -eq 15400 ]; then
+    min_len=31
   fi
 
   # generate multiple pass/hash foreach len (2 to 8)
@@ -690,6 +694,8 @@ function attack_1()
       offset=23
     elif [ ${hash_type} -eq 14900 ]; then
       offset=9
+    elif [ ${hash_type} -eq 15400 ]; then
+      offset=31
     fi
 
     hash_file=${OUTD}/${hash_type}_multihash_combi.txt
@@ -812,6 +818,9 @@ function attack_3()
     elif [ "${hash_type}" -eq 14900 ]; then
       mask_offset=9
       max=9
+    elif [ "${hash_type}" -eq 15400 ]; then
+      mask_offset=31
+      max=31
     fi
 
     i=1
@@ -946,6 +955,9 @@ function attack_3()
     elif [ "${hash_type}" -eq 14900 ]; then
       increment_min=10
       increment_max=10
+    elif [ "${hash_type}" -eq 15400 ]; then
+      increment_min=32
+      increment_max=32
     fi
 
     hash_file=${OUTD}/${hash_type}_multihash_bruteforce.txt
@@ -1156,6 +1168,8 @@ function attack_6()
       max=6
     elif [ "${hash_type}" -eq 14900 ]; then
       max=6
+    elif [ "${hash_type}" -eq 15400 ]; then
+      max=6
     fi
 
     while read -u 9 hash; do
@@ -1263,6 +1277,8 @@ function attack_6()
       max=5
     elif [ ${hash_type} -eq 14900 ]; then
       max=5
+    elif [ ${hash_type} -eq 15400 ]; then
+      max=5
     fi
 
     if ! contains ${hash_type} ${TIMEOUT_ALGOS}; then
@@ -1390,6 +1406,8 @@ function attack_7()
       max=5
     elif [ "${hash_type}" -eq 14900 ]; then
       max=5
+    elif [ "${hash_type}" -eq 15400 ]; then
+      max=5
     fi
 
     i=1
@@ -1515,6 +1533,8 @@ function attack_7()
       max=5
     elif [ ${hash_type} -eq 14900 ]; then
       max=5
+    elif [ ${hash_type} -eq 15400 ]; then
+      max=5
     fi
 
     if ! contains ${hash_type} ${TIMEOUT_ALGOS}; then