From c2976785362be3ad0b8167873a1151c181bd64c9 Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Sun, 1 May 2016 20:52:20 +0200 Subject: [PATCH] Restrict loopback option to straight attack-mode --- docs/changes.txt | 1 + src/oclHashcat.c | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index a0a84dc49..7590015e2 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 913e514be..1c8634eae 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)