From: Jens Steube <jens.steube@gmail.com>
Date: Sun, 1 May 2016 18:52:20 +0000 (+0200)
Subject: Restrict loopback option to straight attack-mode
X-Git-Tag: v3.00-beta~53
X-Git-Url: https://www.flypig.org.uk/git/?a=commitdiff_plain;h=c2976785362be3ad0b8167873a1151c181bd64c9;hp=9b3d18f87d2bf9d537240f0a664eabf111aad4f3;p=hashcat.git

Restrict loopback option to straight attack-mode
---

diff --git a/docs/changes.txt b/docs/changes.txt
index a0a84dc..7590015 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -104,6 +104,7 @@ It combines all features of all hashcat projects in one project.
 - Synchronize maximum output line size with input line size
 - Increased maximum hash line size to 0x50000
 - Run weak-hash checks only in straight-attack mode, this greatly reduces code complexity
+- Restrict loopback option to straight attack-mode
 - Moved rules_optimize to hashcat-utils
 - Stick to older libOpenCL in binary package to avoid errors like this: version `OPENCL_2.0' not found
 - Tightened hash parser for several algorithms
diff --git a/src/oclHashcat.c b/src/oclHashcat.c
index 913e514..1c8634e 100644
--- a/src/oclHashcat.c
+++ b/src/oclHashcat.c
@@ -6330,13 +6330,7 @@ int main (int argc, char **argv)
 
   if (loopback == 1)
   {
-    if (attack_mode == ATTACK_MODE_BF)
-    {
-      log_error ("ERROR: Parameter loopback not allowed in attack-mode 3");
-
-      return (-1);
-    }
-    else if (attack_mode == ATTACK_MODE_STRAIGHT)
+    if (attack_mode == ATTACK_MODE_STRAIGHT)
     {
       if ((rp_files_cnt == 0) && (rp_gen == 0))
       {
@@ -6345,6 +6339,12 @@ int main (int argc, char **argv)
         return (-1);
       }
     }
+    else
+    {
+      log_error ("ERROR: Parameter loopback allowed in attack-mode 0 only");
+
+      return (-1);
+    }
   }
 
   if (debug_mode > 0)