Fixed password reassembling for cracked hashes on host for slow hashe…

…s in optimized mode that are longer than 32 characters
hashcat · Aug 30, 2020 · a1b5af4 · a1b5af4
1 parent 62a7ae4
commit a1b5af4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/docs/changes.txt b/docs/changes.txt
@@ -19,6 +19,7 @@
 - Fixed race condition resulting in out of memory error on startup if multiple hashcat instances are started at the same time
 - Fixed unexpected non-unique salts in multi-hash cracking in Bitcoin/Litecoin wallet.dat module which lead to false negatives
 - Fixed rare case of misalignment of the status prompt when other user warnings are shown within the hashcat output
+- Fixed password reassembling for cracked hashes on host for slow hashes in optimized mode that are longer than 32 characters
 
 ##
 ## Improvements

diff --git a/src/outfile.c b/src/outfile.c
@@ -155,12 +155,24 @@ int build_plain (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, pl
 
       if (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL)
       {
-        for (int i = 0; i < 8; i++)
+        if ((user_options->rp_files_cnt == 0) || (user_options->rp_gen == 0))
         {
-          plain_buf[i] = pw.i[i];
+          for (int i = 0; i < 14; i++)
+          {
+            plain_buf[i] = pw.i[i];
+          }
+
+          plain_len = pw.pw_len;
         }
+        else
+        {
+          for (int i = 0; i < 8; i++)
+          {
+            plain_buf[i] = pw.i[i];
+          }
 
-        plain_len = apply_rules_optimized (straight_ctx->kernel_rules_buf[off].cmds, &plain_buf[0], &plain_buf[4], pw.pw_len);
+          plain_len = apply_rules_optimized (straight_ctx->kernel_rules_buf[off].cmds, &plain_buf[0], &plain_buf[4], pw.pw_len);
+        }
       }
       else
       {