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

docs/changes.txt

@@ -27,6 +27,7 @@
 - Fixed infinite loop when using --loopback in case all hashes have been cracked
 - Fixed kernel loops in --increment mode leading to slower performance
 - Fixed mask length check in hybrid attack-modes: Do not include hash-mode dependant mask length checks
+- Fixed display screen to show input queue when using custom charset or rules
 
 ##
 ## Technical
@@ -42,6 +43,7 @@
 - Hash Parser: Improved error detection of invalid hex characters where hex character are expected
 - OpenCL Runtime: Updated AMDGPU-Pro driver version check, do warn if version 16.50 is detected which is known to be broken
 - Potfile: In v3.10 already, the default potfile suffix changed but the note about was missing. The "hashcat.pot" became "hashcat.potfile"
+- Potfile: Added old potfile detection, show warning message
 - Sanity: Added sanity check to disallow --speed-only in combination with -i
 - Threads: Replaced all calls to ctime() with ctime_r() to ensure thread safety
 - Threads: Replaced all calls to strerror() with %m printf() GNU extension to ensure thread safety

hashcat.hctune

@@ -441,4 +441,10 @@ Iris                                            *       13000   1       1
 
 Iris_Pro                                        *       5000    1       8       8
 Iris_Pro                                        *       6100    1       4       16
+Iris_Pro                                        *       6231    1       1       64
+Iris_Pro                                        *       6232    1       1       32
+Iris_Pro                                        *       6233    1       1       16
 Iris_Pro                                        *       8700    1       1       256
+Iris_Pro                                        *       13731   1       1       64
+Iris_Pro                                        *       13732   1       1       32
+Iris_Pro                                        *       13733   1       1       16

src/potfile.c

@@ -125,6 +125,26 @@ int potfile_init (hashcat_ctx_t *hashcat_ctx)
 
   potfile_ctx->tmp_buf = tmp_buf;
 
+  // old potfile detection
+
+  if (user_options->potfile_path == NULL)
+  {
+    char *potfile_old;
+
+    hc_asprintf (&potfile_old, "%s/hashcat.pot", folder_config->profile_dir);
+
+    hc_stat_t st;
+
+    if (hc_stat (potfile_old, &st) == 0)
+    {
+      event_log_warning (hashcat_ctx, "Old potfile detected: %s", potfile_old);
+      event_log_warning (hashcat_ctx, "New potfile is: %s ", potfile_ctx->filename);
+      event_log_warning (hashcat_ctx, "");
+    }
+
+    hcfree (potfile_old);
+  }
+
   return 0;
 }
 

src/terminal.c

@@ -899,6 +899,26 @@ void status_display (hashcat_ctx_t *hashcat_ctx)
 
       break;
 
+    case INPUT_MODE_STRAIGHT_FILE_RULES_FILE:
+
+      event_log_info (hashcat_ctx,
+        "Input.Queue......: %d/%d (%.02f%%)",
+        hashcat_status->input_base_offset,
+        hashcat_status->input_base_count,
+        hashcat_status->input_base_percent);
+
+      break;
+
+    case INPUT_MODE_STRAIGHT_FILE_RULES_GEN:
+
+      event_log_info (hashcat_ctx,
+        "Input.Queue......: %d/%d (%.02f%%)",
+        hashcat_status->input_base_offset,
+        hashcat_status->input_base_count,
+        hashcat_status->input_base_percent);
+
+      break;
+
     case INPUT_MODE_MASK:
 
       event_log_info (hashcat_ctx,