Merge branch 'master' of https://github.com/hashcat/hashcat

rules/combinator.rule

@@ -22,9 +22,12 @@ c T7
 l $1
 l $2
 l $1$2$3
-l $2$0$0$7
-l $2$0$0$8
-l $2$0$0$9
+l $2$0$1$7
+l $2$0$1$6
+l $2$0$1$8
+l $2$0$1$9
+l $2$0$2$0
+l $2$0$2$1
 
 ## rule: hyphen variety
 ## limits: insert at char positions 3 to 7

src/modules/module_17010.c

@@ -280,7 +280,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
 
   const u32 salt_iter = hc_strtoul ((const char *) token.buf[11], NULL, 10);
 
-  if (salt_iter < 8 || salt_iter > 1000000) return (PARSER_SALT_ITERATION);
+  if (salt_iter < 8 || salt_iter > 65011712) return (PARSER_SALT_ITERATION);
 
   salt->salt_iter = salt_iter;