Fix for https://github.com/hashcat/hashcat/issues/514

include/types.h

@@ -1235,6 +1235,7 @@ typedef struct
   time_t  runtime_start;
   time_t  runtime_stop;
 
+  time_t  prepare_start;
   time_t  prepare_time;
 
   time_t  proc_start;

src/user_options.c

@@ -463,14 +463,14 @@ int user_options_sanity (user_options_t *user_options, restore_ctx_t *restore_ct
     return -1;
   }
 
-  if ((user_options->increment == true) && (user_options->increment_min_chgd == true))
+  if ((user_options->increment == false) && (user_options->increment_min_chgd == true))
   {
     log_error ("ERROR: Increment-min is only supported combined with increment switch");
 
     return -1;
   }
 
-  if ((user_options->increment == true) && (user_options->increment_max_chgd == true))
+  if ((user_options->increment == false) && (user_options->increment_max_chgd == true))
   {
     log_error ("ERROR: Increment-max is only supported combined with increment switch");
 
@@ -856,6 +856,26 @@ int user_options_extra_init (user_options_t *user_options, restore_ctx_t *restor
   if (user_options->attack_mode == ATTACK_MODE_BF)
   {
     user_options_extra->wordlist_mode = WL_MODE_MASK;
+
+    // default mask
+
+    if (user_options->benchmark == false)
+    {
+      if ((user_options_extra->optind + 2) <= restore_ctx->argc)
+      {
+        // user provides mask
+      }
+      else
+      {
+        // prepare default mask charset
+
+        user_options->custom_charset_1 = (char *) "?l?d?u";
+        user_options->custom_charset_2 = (char *) "?l?d";
+        user_options->custom_charset_3 = (char *) "?l?d*!$@_";
+
+        user_options->increment = true;
+      }
+    }
   }
 
   /* still needed?
@@ -868,26 +888,6 @@ int user_options_extra_init (user_options_t *user_options, restore_ctx_t *restor
   }
   */
 
-  // default mask
-
-  if (user_options->benchmark == false)
-  {
-    if ((user_options_extra->optind + 2) <= restore_ctx->argc)
-    {
-      // user provides mask
-    }
-    else
-    {
-      // prepare default mask charset
-
-      user_options->custom_charset_1 = (char *) "?l?d?u";
-      user_options->custom_charset_2 = (char *) "?l?d";
-      user_options->custom_charset_3 = (char *) "?l?d*!$@_";
-
-      user_options->increment = true;
-    }
-  }
-
   return 0;
 }