Some fixes for rare kernels

[hashcat.git] / OpenCL / simd.c

diff --git a/OpenCL/simd.c b/OpenCL/simd.c
index 9e87b2c..22a9f29 100644 (file)
--- a/OpenCL/simd.c
+++ b/OpenCL/simd.c
@@ -20,9 +20,7 @@
                                                                                                             \
     if (atomic_add (&hashes_shown[final_hash_pos], 1) == 0)                                                 \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos);                                    \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos);                       \
     }                                                                                                       \
   }                                                                                                         \
 }
@@ -38,17 +36,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp0, digests_cnt, &digests_buf[digests_offset]);                       \
+    int digest_pos = find_hash (digest_tp0, digests_cnt, &digests_buf[digests_offset]);                     \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (atomic_add (&hashes_shown[final_hash_pos], 1) == 0)                                               \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos);                                  \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos);            \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -73,9 +69,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 0) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 0);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 0);                   \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -85,9 +79,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 1) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 1);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 1);                   \
     }                                                                                                       \
   }                                                                                                         \
 }
@@ -104,17 +96,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp0, digests_cnt, &digests_buf[digests_offset]);                       \
+    int digest_pos = find_hash (digest_tp0, digests_cnt, &digests_buf[digests_offset]);                     \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 0) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 0);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 0);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -126,17 +116,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp1, digests_cnt, &digests_buf[digests_offset]);                       \
+    int digest_pos = find_hash (digest_tp1, digests_cnt, &digests_buf[digests_offset]);                     \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 1) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 1);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 1);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -159,9 +147,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 0) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 0);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 0);                   \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -171,9 +157,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 1) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 1);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 1);                   \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -183,9 +167,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 2) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 2);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 2);                   \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -195,9 +177,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 3) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 3);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 3);                   \
     }                                                                                                       \
   }                                                                                                         \
 }
@@ -216,17 +196,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp0, digests_cnt, &digests_buf[digests_offset]);                       \
+    int digest_pos = find_hash (digest_tp0, digests_cnt, &digests_buf[digests_offset]);                     \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 0) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 0);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 0);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -238,17 +216,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp1, digests_cnt, &digests_buf[digests_offset]);                       \
+    int digest_pos = find_hash (digest_tp1, digests_cnt, &digests_buf[digests_offset]);                     \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 1) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 1);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 1);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -260,17 +236,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp2, digests_cnt, &digests_buf[digests_offset]);                       \
+    int digest_pos = find_hash (digest_tp2, digests_cnt, &digests_buf[digests_offset]);                     \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 2) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 2);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 2);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -282,17 +256,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp3, digests_cnt, &digests_buf[digests_offset]);                       \
+    int digest_pos = find_hash (digest_tp3, digests_cnt, &digests_buf[digests_offset]);                     \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 3) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 3);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 3);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -315,9 +287,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 0) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 0);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 0);                   \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -327,9 +297,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 1) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 1);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 1);                   \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -339,9 +307,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 2) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 2);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 2);                   \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -351,9 +317,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 3) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 3);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 3);                   \
     }                                                                                                       \
   }                                                                                                         \
   if (((h0).s4 == search[0]) && ((h1).s4 == search[1]) && ((h2).s4 == search[2]) && ((h3).s4 == search[3])) \
@@ -362,9 +326,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 4) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 4);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 4);                   \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -374,9 +336,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 5) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 5);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 5);                   \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -386,9 +346,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 6) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 6);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 6);                   \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -398,9 +356,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 7) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 7);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 7);                   \
     }                                                                                                       \
   }                                                                                                         \
 }
@@ -423,17 +379,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp0, digests_cnt, &digests_buf[digests_offset]);                       \
+    int digest_pos = find_hash (digest_tp0, digests_cnt, &digests_buf[digests_offset]);                     \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 0) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 0);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 0);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -445,17 +399,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp1, digests_cnt, &digests_buf[digests_offset]);                       \
+    int digest_pos = find_hash (digest_tp1, digests_cnt, &digests_buf[digests_offset]);                     \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 1) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 1);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 1);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -467,17 +419,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp2, digests_cnt, &digests_buf[digests_offset]);                       \
+    int digest_pos = find_hash (digest_tp2, digests_cnt, &digests_buf[digests_offset]);                     \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 2) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 2);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 2);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -489,17 +439,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp3, digests_cnt, &digests_buf[digests_offset]);                       \
+    int digest_pos = find_hash (digest_tp3, digests_cnt, &digests_buf[digests_offset]);                     \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 3) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 3);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 3);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -510,17 +458,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp4, digests_cnt, &digests_buf[digests_offset]);                       \
+    int digest_pos = find_hash (digest_tp4, digests_cnt, &digests_buf[digests_offset]);                     \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 4) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 4);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 4);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -532,17 +478,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp5, digests_cnt, &digests_buf[digests_offset]);                       \
+    int digest_pos = find_hash (digest_tp5, digests_cnt, &digests_buf[digests_offset]);                     \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 5) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 5);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 5);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -554,17 +498,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp6, digests_cnt, &digests_buf[digests_offset]);                       \
+    int digest_pos = find_hash (digest_tp6, digests_cnt, &digests_buf[digests_offset]);                     \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 6) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 6);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 6);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -576,17 +518,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp7, digests_cnt, &digests_buf[digests_offset]);                       \
+    int digest_pos = find_hash (digest_tp7, digests_cnt, &digests_buf[digests_offset]);                     \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 7) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 7);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 7);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -609,9 +549,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 0) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 0);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 0);                   \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -621,9 +559,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 1) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 1);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 1);                   \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -633,9 +569,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 2) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 2);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 2);                   \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -645,9 +579,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 3) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 3);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 3);                   \
     }                                                                                                       \
   }                                                                                                         \
   if (((h0).s4 == search[0]) && ((h1).s4 == search[1]) && ((h2).s4 == search[2]) && ((h3).s4 == search[3])) \
@@ -656,9 +588,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 4) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 4);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 4);                   \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -668,9 +598,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 5) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 5);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 5);                   \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -680,9 +608,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 6) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 6);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 6);                   \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -692,9 +618,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 7) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 7);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 7);                   \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -704,9 +628,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 8) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 8);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 8);                   \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -716,9 +638,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 9) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))      \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 9);                                \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 9);                   \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -728,9 +648,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 10) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))     \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 10);                               \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 10);                  \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -740,9 +658,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 11) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))     \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 11);                               \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 11);                  \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -752,9 +668,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 12) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))     \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 12);                               \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 12);                  \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -764,9 +678,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 13) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))     \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 13);                               \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 13);                  \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -776,9 +688,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 14) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))     \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 14);                               \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 14);                  \
     }                                                                                                       \
   }                                                                                                         \
                                                                                                             \
@@ -788,9 +698,7 @@
                                                                                                             \
     if (vector_accessible (il_pos, il_cnt, 15) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))     \
     {                                                                                                       \
-      mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 15);                               \
-                                                                                                            \
-      d_return_buf[lid] = 1;                                                                                \
+      mark_hash (plains_buf, d_return_buf, salt_pos, 0, final_hash_pos, gid, il_pos + 15);                  \
     }                                                                                                       \
   }                                                                                                         \
 }
@@ -821,17 +729,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp00, digests_cnt, &digests_buf[digests_offset]);                      \
+    int digest_pos = find_hash (digest_tp00, digests_cnt, &digests_buf[digests_offset]);                    \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 0) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 0);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 0);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -843,17 +749,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp01, digests_cnt, &digests_buf[digests_offset]);                      \
+    int digest_pos = find_hash (digest_tp01, digests_cnt, &digests_buf[digests_offset]);                    \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 1) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 1);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 1);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -865,17 +769,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp02, digests_cnt, &digests_buf[digests_offset]);                      \
+    int digest_pos = find_hash (digest_tp02, digests_cnt, &digests_buf[digests_offset]);                    \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 2) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 2);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 2);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -887,17 +789,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp03, digests_cnt, &digests_buf[digests_offset]);                      \
+    int digest_pos = find_hash (digest_tp03, digests_cnt, &digests_buf[digests_offset]);                    \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 3) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 3);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 3);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -909,17 +809,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp04, digests_cnt, &digests_buf[digests_offset]);                      \
+    int digest_pos = find_hash (digest_tp04, digests_cnt, &digests_buf[digests_offset]);                    \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 4) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 4);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 4);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -931,17 +829,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp05, digests_cnt, &digests_buf[digests_offset]);                      \
+    int digest_pos = find_hash (digest_tp05, digests_cnt, &digests_buf[digests_offset]);                    \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 5) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 5);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 5);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -953,17 +849,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp06, digests_cnt, &digests_buf[digests_offset]);                      \
+    int digest_pos = find_hash (digest_tp06, digests_cnt, &digests_buf[digests_offset]);                    \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 6) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 6);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 6);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -975,17 +869,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp07, digests_cnt, &digests_buf[digests_offset]);                      \
+    int digest_pos = find_hash (digest_tp07, digests_cnt, &digests_buf[digests_offset]);                    \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 7) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 7);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 7);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -997,17 +889,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp08, digests_cnt, &digests_buf[digests_offset]);                      \
+    int digest_pos = find_hash (digest_tp08, digests_cnt, &digests_buf[digests_offset]);                    \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 8) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 8);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 8);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -1019,17 +909,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp09, digests_cnt, &digests_buf[digests_offset]);                      \
+    int digest_pos = find_hash (digest_tp09, digests_cnt, &digests_buf[digests_offset]);                    \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 9) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))    \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 9);                              \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 9);        \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -1041,17 +929,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp10, digests_cnt, &digests_buf[digests_offset]);                      \
+    int digest_pos = find_hash (digest_tp10, digests_cnt, &digests_buf[digests_offset]);                    \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 10) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))   \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 10);                             \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 10);       \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -1063,17 +949,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp11, digests_cnt, &digests_buf[digests_offset]);                      \
+    int digest_pos = find_hash (digest_tp11, digests_cnt, &digests_buf[digests_offset]);                    \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 11) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))   \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 11);                             \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 11);       \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -1085,17 +969,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp12, digests_cnt, &digests_buf[digests_offset]);                      \
+    int digest_pos = find_hash (digest_tp12, digests_cnt, &digests_buf[digests_offset]);                    \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 12) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))   \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 12);                             \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 12);       \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -1107,17 +989,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp13, digests_cnt, &digests_buf[digests_offset]);                      \
+    int digest_pos = find_hash (digest_tp13, digests_cnt, &digests_buf[digests_offset]);                    \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 13) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))   \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 13);                             \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 13);       \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -1129,17 +1009,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp14, digests_cnt, &digests_buf[digests_offset]);                      \
+    int digest_pos = find_hash (digest_tp14, digests_cnt, &digests_buf[digests_offset]);                    \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 14) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))   \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 14);                             \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 14);       \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \
@@ -1151,17 +1029,15 @@
              bitmap_shift1,                                                                                 \
              bitmap_shift2))                                                                                \
   {                                                                                                         \
-    int hash_pos = find_hash (digest_tp15, digests_cnt, &digests_buf[digests_offset]);                      \
+    int digest_pos = find_hash (digest_tp15, digests_cnt, &digests_buf[digests_offset]);                    \
                                                                                                             \
-    if (hash_pos != -1)                                                                                     \
+    if (digest_pos != -1)                                                                                   \
     {                                                                                                       \
-      const u32 final_hash_pos = digests_offset + hash_pos;                                                 \
+      const u32 final_hash_pos = digests_offset + digest_pos;                                               \
                                                                                                             \
       if (vector_accessible (il_pos, il_cnt, 15) && (atomic_add (&hashes_shown[final_hash_pos], 1) == 0))   \
       {                                                                                                     \
-        mark_hash (plains_buf, hashes_shown, final_hash_pos, gid, il_pos + 15);                             \
-                                                                                                            \
-        d_return_buf[lid] = 1;                                                                              \
+        mark_hash (plains_buf, d_return_buf, salt_pos, digest_pos, final_hash_pos, gid, il_pos + 15);       \
       }                                                                                                     \
     }                                                                                                       \
   }                                                                                                         \