Fix and complete one/many salts debugging

Author: magnumripper

run/john.conf

@@ -565,9 +565,11 @@ TrustPadding = Y
 #somedirectory
 #$JOHN/my.pot
 
-# Changing this to Yes will enable legacy-style benchmarks, for comparisons
 [Debug]
+# Changing this to Yes will enable legacy-style benchmarks, for comparisons
 Benchmarks_1_8 = N
+# Changing this to Yes will test salted formats as one/many salts, for debug
+BenchmarkMany = N
 
 [PRINCE]
 # Default wordlist file name. Will fall back to standard wordlist if not

src/bench.c

@@ -742,8 +742,9 @@ int benchmark_all(void)
 			continue;
 
 /* Hack for scripting raw/one/many tests, only test salted formats */
-		if (!cfg_get_bool(SECTION_DEBUG, NULL, "BenchmarkMany", 0)) {
-			if (!format->params.salt_size)
+		if (cfg_get_bool(SECTION_DEBUG, NULL, "BenchmarkMany", 0)) {
+			if (!format->params.salt_size ||
+			    (format->params.flags & FMT_DYNAMIC))
 				continue;
 			format->params.benchmark_length &= ~0x500;
 		}